diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
index b3817f646b..a4015264ca 100644
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -73,7 +73,7 @@ void AssignmentClientMonitor::waitOnChildren(int msecs) {
 
         if (childProcess->state() == QProcess::NotRunning) {
             i.remove();
-        } else {
+        } else if (msecs > 0) {
             qDebug() << "Waiting on child process" << childProcess->processId() << "to finish.";
             bool finished = childProcess->waitForFinished(msecs);
             if (finished) {
diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp
index e28e596ae4..1c4426fc4d 100644
--- a/assignment-client/src/main.cpp
+++ b/assignment-client/src/main.cpp
@@ -9,10 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-
 #include "AssignmentClientApp.h"
 
+#include <QtCore/QDebug>
+
 int main(int argc, char* argv[]) {
     AssignmentClientApp app(argc, argv);
-    return app.exec();
+    int acReturn = app.exec();
+    qDebug() << "assignment-client process" <<  app.applicationPid() << "exiting with status code" << acReturn;
 }