diff --git a/overviewer.py b/overviewer.py
index cea9bbb..c296c10 100755
--- a/overviewer.py
+++ b/overviewer.py
@@ -135,10 +135,14 @@ def main():
         c_overviewer.set_render_mode_options(mode, options.rendermode_options[mode])
     
     if options.list_rendermodes:
+        avail_rendermodes = c_overviewer.get_render_modes()
         rendermode_info = map(c_overviewer.get_render_mode_info, avail_rendermodes)
         name_width = max(map(lambda i: len(i['name']), rendermode_info))
         for info in rendermode_info:
-            print "{name:{0}} {description}".format(name_width, **info)
+            if not 'description' in info:
+                print "{name:{0}} (no description)".format(name_width, **info)
+            else:
+                print "{name:{0}} {description}".format(name_width, **info)
         sys.exit(0)
 
     if len(args) < 1:
diff --git a/src/rendermode-cave.c b/src/rendermode-cave.c
index b8fc370..d5410ee 100644
--- a/src/rendermode-cave.c
+++ b/src/rendermode-cave.c
@@ -231,6 +231,7 @@ rendermode_cave_draw(void *data, RenderState *state, PyObject *src, PyObject *ma
 
 static RenderModeOption rendermode_cave_options[] = {
     {"depth_tinting", "tint caves based on how deep they are (default: True)"},
+    {NULL, NULL}
 };
 
 RenderModeInterface rendermode_cave = {
diff --git a/src/rendermode-lighting.c b/src/rendermode-lighting.c
index c4029ae..8f27084 100644
--- a/src/rendermode-lighting.c
+++ b/src/rendermode-lighting.c
@@ -259,6 +259,7 @@ rendermode_lighting_draw(void *data, RenderState *state, PyObject *src, PyObject
 
 RenderModeOption rendermode_lighting_options[] = {
     {"shade_strength", "how dark to make the shadows, from 0.0 to 1.0 (default: 1.0)"},
+    {NULL, NULL}
 };
 
 RenderModeInterface rendermode_lighting = {
diff --git a/src/rendermode-normal.c b/src/rendermode-normal.c
index a24bc80..c9ac6a8 100644
--- a/src/rendermode-normal.c
+++ b/src/rendermode-normal.c
@@ -288,6 +288,7 @@ static RenderModeOption rendermode_normal_options[] = {
     {"edge_opacity", "darkness of the edge lines, from 0.0 to 1.0 (default: 0.15)"},
     {"min_depth", "lowest level of blocks to render (default: 0)"},
     {"max_depth", "highest level of blocks to render (default: 127)"},
+    {NULL, NULL}
 };
 
 RenderModeInterface rendermode_normal = {