diff --git a/lib/spawn/spawn.c b/lib/spawn/spawn.c
index 9162f6b..14b6cff 100644
--- a/lib/spawn/spawn.c
+++ b/lib/spawn/spawn.c
@@ -335,6 +335,11 @@ errval_t spawn_load_argv(int argc, char *argv[], struct spawninfo *si,
         return SPAWN_ERR_OUT_OF_PIDS;
     }
 
+    if(argc == 0) {
+        debug_printf("[spawn_load_argv] argc == 0 (no arguments)\n");
+        return SPAWN_ERR_FIND_MODULE;
+    }
+
     // - Initialize the spawn_info struct
     // TODO
     // copy name to spawninfo struct