diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/core/Core.java b/src/main/java/de/hhu/ba/yoshikoWrapper/core/Core.java
index 6a18e92d4a6360f2d2c50101cac16432975dcb4f..8d15d888412ed64bcfdf701f17d39db95b0e1391 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/core/Core.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/core/Core.java
@@ -22,6 +22,7 @@ public class Core {
 		CyNetwork currentNetwork = cy.getCurrentNetwork();
 		if (currentNetwork == null) {
 			//TODO
+			return;
 		}
 		
 		LibraryInterface.setTimeLimit(timeLimit);
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/TimeLimitSetter.java b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/TimeLimitSetter.java
index 1c8a3a83719f1c8f6744dc33f4930575286f7430..e30530485089030d41c1cefbacb5a6724d084097 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/TimeLimitSetter.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/TimeLimitSetter.java
@@ -1,5 +1,6 @@
 package de.hhu.ba.yoshikoWrapper.gui;
 
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -17,10 +18,9 @@ public class TimeLimitSetter extends JPanel{
 	private NumberInputField numberField;
 	
 	public TimeLimitSetter() {
-		checkBox = new JCheckBox();
+		checkBox = new JCheckBox("Use time limit (s):");
 		numberField = new NumberInputField();
 		numberField.setEnabled(false); //By default time limit is turned off
-		numberField.setSize(40, 10);
 		checkBox.addActionListener(
 				new ActionListener() {
 
@@ -37,7 +37,7 @@ public class TimeLimitSetter extends JPanel{
 	}
 	
 	public int getTimeLimit() {
-		if (checkBox.isSelected()) {
+		if (!checkBox.isSelected()) {
 			return -1;
 		}
 		return numberField.getTimeLimit();