diff --git a/src/bin/shell/commands.c b/src/bin/shell/commands.c
index d6009d3..052548e 100644
--- a/src/bin/shell/commands.c
+++ b/src/bin/shell/commands.c
@@ -29,10 +29,16 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <sys/mpi.h>
+
 #include "shell.h"
 
 int commands(inputBuffer *data) {
   int cPid = 0x0,i = 0x0;
+
+  if (data == NULL) return 1;
+  if (data->args->arg == NULL) return 1;
+  if (*data->args->arg == '\0') return 1;
+
   if (0 == memcmp(data->args->arg, "uname", 5)) {
     printf("UbixOS v0.87  " __DATE__" " __TIME__ " \n");
     return(1);