diff --git a/src/main/java/net/kuujo/vertigo/util/Context.java b/src/main/java/net/kuujo/vertigo/util/Context.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/kuujo/vertigo/util/Context.java
+++ b/src/main/java/net/kuujo/vertigo/util/Context.java
@@ -58,7 +58,7 @@ public final class Context {
         return InstanceContext.fromJson(contextInfo);
       }
     }
-    throw new IllegalArgumentException("No context found.");
+    return null;
   }
 
 }
Return null if context is not found in verticle configuration.