diff --git a/src/main/java/net/kuujo/copycat/impl/DefaultStateMachineExecutor.java b/src/main/java/net/kuujo/copycat/impl/DefaultStateMachineExecutor.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/kuujo/copycat/impl/DefaultStateMachineExecutor.java
+++ b/src/main/java/net/kuujo/copycat/impl/DefaultStateMachineExecutor.java
@@ -85,7 +85,8 @@ public class DefaultStateMachineExecutor implements StateMachineExecutor {
 
   @Override
   public Command getCommand(String name) {
-    return commands.get(name).info;
+    CommandWrapper command = commands.get(name);
+    return command != null ? command.info : null;
   }
 
   @Override
Handle NPE in state machine executor.