diff --git a/src/com/sheepit/client/Log.java b/src/com/sheepit/client/Log.java
index 9be2a2b..56ceb0c 100644
--- a/src/com/sheepit/client/Log.java
+++ b/src/com/sheepit/client/Log.java
@@ -57,7 +57,7 @@ public class Log {
 	private void append(String level_, String msg_) {
 		if (msg_.equals("") == false) {
 			String line = this.dateFormat.format(new java.util.Date()) + " (" + level_ + ") " + msg_;
-			if (this.checkpoints.containsKey(this.lastCheckPoint)) {
+			if (this.checkpoints.containsKey(this.lastCheckPoint) && this.checkpoints.get(this.lastCheckPoint) != null) {
 				this.checkpoints.get(this.lastCheckPoint).add(line);
 			}
 			if (this.printStdOut == true) {