diff --git a/layers/draw_state.c b/layers/draw_state.c
index b16a5ef..9ff8e2c 100644
--- a/layers/draw_state.c
+++ b/layers/draw_state.c
@@ -154,7 +154,7 @@
 }
 // Return the size of the underlying struct based on Bind Point enum
 //  Have to do this b/c VIEWPORT doesn't have sType in its createinfo struct
-static XGL_SIZE dynStateCreateInfoSize(XGL_STRUCTURE_TYPE sType)
+static XGL_SIZE dynStateCreateInfoSize(XGL_STATE_BIND_POINT sType)
 {
     switch (sType)
     {
diff --git a/xgl-helper.py b/xgl-helper.py
index be7f71b..ef958e7 100755
--- a/xgl-helper.py
+++ b/xgl-helper.py
@@ -588,6 +588,8 @@
                     sh_funcs.append('            return %s((%s*)pStruct, indent);\n' % (print_func_name, struct_name))
                     sh_funcs.append('        }\n')
                     sh_funcs.append('        break;\n')
+                sh_funcs.append("        default:\n")
+                sh_funcs.append("        return NULL;\n")
                 sh_funcs.append("    }\n")
         sh_funcs.append("}")
         return "".join(sh_funcs)
@@ -1036,6 +1038,8 @@
                     gv_funcs.append('            return %s((%s*)pStruct, nodeName);\n' % (print_func_name, struct_name))
                     #gv_funcs.append('        }\n')
                     #gv_funcs.append('        break;\n')
+                gv_funcs.append("        default:\n")
+                gv_funcs.append("        return NULL;\n")
                 gv_funcs.append("    }\n")
         gv_funcs.append("}")
         return "".join(gv_funcs)