diff --git a/src/server/simpleslave.c b/src/server/simpleslave.c
--- a/src/server/simpleslave.c
+++ b/src/server/simpleslave.c
@@ -57,6 +57,7 @@ int main(int argc, char *argv[])
   server = NULL;
   username = NULL;
   password = NULL;
+  hostname = NULL;
 
   char curopt;
 
@@ -93,6 +94,34 @@ int main(int argc, char *argv[])
   /* Get conf data */
   options_init(argc, argv, &my_cfg, myopts, "slave", &commonopts);
 
+  if(!datadir)
+    {
+      fprintf(stderr, "datadir not set\n");
+      return 1;
+    }
+  if(!server)
+    {
+      fprintf(stderr, "server not set\n");
+      return 1;
+    }
+  if(!username)
+    {
+      fprintf(stderr, "username not set\n");
+      return 1;
+    }
+  if(!password)
+    {
+      fprintf(stderr, "password not set\n");
+      return 1;
+    }
+  if(!hostname)
+    {
+      fprintf(stderr, "hostname not set\n");
+      return 1;
+    }
+
+  
+
   /* Notifies the user if there no username in .conf */
   if(checkUsername(username))
     return 1;
@@ -134,16 +163,20 @@ int main(int argc, char *argv[])
   char option[1] = "";
   fprintf(stderr,"Do you want to recalculate render power? (y/n): ");
   scanf("%s", option);
-  if(!strcmp(option, "y")){
-    if(slaveBenchmark(datadir, &benchmarkTime, &renderPower)){
-      fprintf(stderr,"Benchmark failed! Exiting.\n");
-      return 1;
+  if(!strcmp(option, "y"))
+    {
+      if(slaveBenchmark(datadir, &benchmarkTime, &renderPower))
+	{
+	  fprintf(stderr,"Benchmark failed! Exiting.\n");
+	  return 1;
+	}
+      else
+	{
+	  fprintf(stderr,"Benchmark successful, time taken was %d seconds, giving you a render power of %d.\n",
+		  benchmarkTime, renderPower);
+	  _web_setrenderpower(slavekey, password, renderPower);
+	}
     }
-    else{
-      fprintf(stderr,"Benchmark successful, time taken was %d seconds, giving you a render power of %d.\n", benchmarkTime, renderPower);
-      _web_setrenderpower(slavekey, password, renderPower);
-    }
-  }
 
   // Main loop
   while(!quit)