diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c
index 6601aceb..d32e8293 100644
--- a/src/afl-forkserver.c
+++ b/src/afl-forkserver.c
@@ -522,6 +522,10 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
 
           }
 
+        } else {
+
+          FATAL("Target requested sharedmem fuzzing, but we failed to enable it.");
+
         }
 
       }
diff --git a/unicorn_mode/UNICORNAFL_VERSION b/unicorn_mode/UNICORNAFL_VERSION
index 308f68fa..5ccb9480 100644
--- a/unicorn_mode/UNICORNAFL_VERSION
+++ b/unicorn_mode/UNICORNAFL_VERSION
@@ -1 +1 @@
-37067ac
+f633b2a
diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl
index 707060cb..f633b2a6 160000
--- a/unicorn_mode/unicornafl
+++ b/unicorn_mode/unicornafl
@@ -1 +1 @@
-Subproject commit 707060cbc3b9d978f6e47d037ad05b2bfc5e88a9
+Subproject commit f633b2a6d918631a9f37f3785449f331e4301551