diff --git a/src/view/StartWindow.java b/src/view/StartWindow.java
index 90209a86de594baab8a5d8f86f1f9396de163275..394aa579591a3e6d034ba7422538a09712ac92cc 100644
--- a/src/view/StartWindow.java
+++ b/src/view/StartWindow.java
@@ -29,6 +29,7 @@ public class StartWindow extends JFrame {
 		startButton.addActionListener(new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
+				if(mapList.getSelectedValue() != null)
 				engine.selectMap(mapList.getSelectedValue());
 			}
 		});