diff --git a/src/demo/demo.c b/src/demo/demo.c
index 18360599d..d4587813b 100644
--- a/src/demo/demo.c
+++ b/src/demo/demo.c
@@ -223,9 +223,12 @@ ext_demos(struct notcurses* nc, const char* demos){
       case 'v': ret = view_demo(nc); break;
       case 'w': ret = widecolor_demo(nc); break;
       case 'p': ret = panelreel_demo(nc); break;
+      default:
+        fprintf(stderr, "Unknown demo specification: %c\n", *demos);
+        ret = -1;
+        break;
     }
     if(ret){
-      fprintf(stderr, "Unknown demo specification: %c\n", *demos);
       return ret;
     }
     ++demos;
diff --git a/src/demo/unicodeblocks.c b/src/demo/unicodeblocks.c
index 22c4baee3..7e9c330bd 100644
--- a/src/demo/unicodeblocks.c
+++ b/src/demo/unicodeblocks.c
@@ -131,11 +131,11 @@ int unicodeblocks_demo(struct notcurses* nc){
       cell c = CELL_TRIVIAL_INITIALIZER;
       // 16 to a line
       for(z = 0 ; z < CHUNKSIZE ; ++z){
-        mbstate_t ps;
-        memset(&ps, 0, sizeof(ps));
         wchar_t w[2] = { blockstart + chunk * CHUNKSIZE + z, L'\u200e' };
         char utf8arr[MB_CUR_MAX * 2 + 1];
         if(wcswidth(w, 2) >= 1 && iswprint(w[0])){
+          mbstate_t ps;
+          memset(&ps, 0, sizeof(ps));
           const wchar_t *wptr = w;
           int bwc = wcsrtombs(utf8arr, &wptr, sizeof(utf8arr), &ps);
           if(bwc < 0){