diff --git a/de.prob.core/src/de/prob/core/Animator.java b/de.prob.core/src/de/prob/core/Animator.java
index ad8901b17fd22ca504219767355f4c832dd40b9e..e78a5611b36a4821ca7e01fd01fdc0075bfba21c 100644
--- a/de.prob.core/src/de/prob/core/Animator.java
+++ b/de.prob.core/src/de/prob/core/Animator.java
@@ -6,18 +6,12 @@
 
 package de.prob.core;
 
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.osgi.service.prefs.Preferences;
 
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
-
 import de.prob.core.command.IComposableCommand;
 import de.prob.core.domainobjects.History;
 import de.prob.core.domainobjects.MachineDescription;
@@ -29,7 +23,6 @@ import de.prob.core.internal.AnimatorImpl;
 import de.prob.core.internal.ServerTraceConnection;
 import de.prob.core.internal.TraceConnectionProvider;
 import de.prob.exceptions.ProBException;
-import de.prob.model.eventb.Model;
 
 
 /**
diff --git a/de.prob.ui/src/de/prob/ui/ltl/CounterExampleTab.java b/de.prob.ui/src/de/prob/ui/ltl/CounterExampleTab.java
index f3170291f8de5203287d1e9fc52cafee06d9bd99..038ed22b66e301b266b548f92473c374914099e8 100644
--- a/de.prob.ui/src/de/prob/ui/ltl/CounterExampleTab.java
+++ b/de.prob.ui/src/de/prob/ui/ltl/CounterExampleTab.java
@@ -275,19 +275,15 @@ public class CounterExampleTab {
 
 	public void zoomIn() {
 		final ZoomManager zoomManager = rootEditPart.getZoomManager();
-		if (zoomManager != null) {
-			if (zoomManager != null && zoomManager.canZoomIn()) {
-				zoomManager.setZoom(zoomManager.getNextZoomLevel());
-			}
+		if (zoomManager != null && zoomManager.canZoomIn()) {
+			zoomManager.setZoom(zoomManager.getNextZoomLevel());
 		}
 	}
 
 	public void zoomOut() {
 		final ZoomManager zoomManager = rootEditPart.getZoomManager();
-		if (zoomManager != null) {
-			if (zoomManager != null && zoomManager.canZoomOut()) {
-				zoomManager.setZoom(zoomManager.getPreviousZoomLevel());
-			}
+		if (zoomManager != null && zoomManager.canZoomOut()) {
+			zoomManager.setZoom(zoomManager.getPreviousZoomLevel());
 		}
 	}
 
diff --git a/de.prob.ui/src/de/prob/ui/ltl/LtlCheckingDialog.java b/de.prob.ui/src/de/prob/ui/ltl/LtlCheckingDialog.java
index d8abf60cbb848ab0759118ed6a1639b476b2675e..0860779f1f4078267f51ca61d5bd48cf6cd19233 100644
--- a/de.prob.ui/src/de/prob/ui/ltl/LtlCheckingDialog.java
+++ b/de.prob.ui/src/de/prob/ui/ltl/LtlCheckingDialog.java
@@ -413,7 +413,7 @@ public final class LtlCheckingDialog extends TrayDialog {
 					Logger.notifyUser("Command exception", e);
 				} finally {
 					try {
-						reader.close();
+						if (reader != null) reader.close();
 					} catch (IOException e) {
 						Logger.notifyUser("Unexpected IO exception", e);
 					}