diff --git a/headstart-core.bash b/headstart-core.bash
index 796175179ca1c42ce4a517cc5e56ceb0e9093e4f..1e592e357603ee9a7455ca86657f39f2bb1a397f 100644
--- a/headstart-core.bash
+++ b/headstart-core.bash
@@ -161,5 +161,11 @@ function headstart() {
     fi
   fi
 
+  if [[ "${rest[*]}" == '' ]]; then
+    trap - ERR
+    @go
+    return
+  fi
+
   @go "${rest[@]}"
 }