diff --git a/src/compose.js b/src/compose.js
index acce2b5..6b75743 100644
--- a/src/compose.js
+++ b/src/compose.js
@@ -50,6 +50,6 @@ function processInstruction(composer, instruction){
     currentBehavior:composer.currentBehavior
   })).then(next => {
     composer.currentBehavior = next;
-    composer.currentViewModel = next.executionContext;
+    composer.currentViewModel = next ? next.executionContext : null;
   });
 }