diff --git a/judge/manager/network_controller.cpp b/judge/manager/network_controller.cpp
index fcca84e619b9616248617eac6184db14ef4787e0..5a689a0d736ea9f1cb7256b5a99f44f12158590f 100644
--- a/judge/manager/network_controller.cpp
+++ b/judge/manager/network_controller.cpp
@@ -19,7 +19,7 @@ MovementResult NetworkReceiver::QuerySetup(const char * opponentName, string set
 	//fprintf(stderr,"	NetworkReceiver::QuerySetup... ");
 	for (int ii=0; ii < 4; ++ii)
 	{
-		assert(network->GetMessage(setup[ii], 20));
+		assert(network->GetMessage(setup[ii], 20000));
 	}
 	//fprintf(stderr,"Done!\n");
 	return MovementResult::OK;
@@ -34,6 +34,6 @@ MovementResult NetworkSender::QueryMove(string & buffer)
 
 MovementResult NetworkReceiver::QueryMove(string & buffer)
 {
-	assert(network->GetMessage(buffer, 20));
+	assert(network->GetMessage(buffer, 20000));
 	return MovementResult::OK;
 }
diff --git a/judge/manager/program.cpp b/judge/manager/program.cpp
index 2d09a510aa6e9c70ba0c0f0bf4922812de7cae63..02c9cb86ea3f0eb86781dd4ef923467f3a936002 100644
--- a/judge/manager/program.cpp
+++ b/judge/manager/program.cpp
@@ -8,6 +8,7 @@
 #include "program.h"
 #include <vector>
 #include <string.h>
+#include <stdio.h>
 
 using namespace std;
 
@@ -56,10 +57,13 @@ Program::Program(const char * executablePath) : input(NULL), output(NULL), pid(0
 	}
 	while (token != NULL);
 
-	char **  arguments = new char*[args.size()+2];
-	for (unsigned int i=0; i < args.size(); ++i)
-		arguments[i] = args[i];
-
+	char **  arguments = NULL;
+        if (args.size() > 0)
+	{
+		arguments = new char*[args.size()+2];
+		for (unsigned int i=0; i < args.size(); ++i)
+			arguments[i] = args[i];
+	}
 	//See if file exists and is executable...
 	if (access(executablePath, X_OK) != 0)
 	{
@@ -89,8 +93,10 @@ Program::Program(const char * executablePath) : input(NULL), output(NULL), pid(0
 				
 
 		if (access(executablePath, X_OK) == 0) //Check we STILL have permissions to start the file
+		{
 			execv(executablePath,arguments); ///Replace process with desired executable
-		
+		}
+		perror("execv error:\n");
 		fprintf(stderr, "Program::Program - Could not run program \"%s\"!\n", executablePath);
 		exit(EXIT_FAILURE); //We will probably have to terminate the whole program if this happens
 	}