diff --git a/src/main/java/seng202/group9/GUI/DatasetController.java b/src/main/java/seng202/group9/GUI/DatasetController.java
index 9082c98..0340175 100644
--- a/src/main/java/seng202/group9/GUI/DatasetController.java
+++ b/src/main/java/seng202/group9/GUI/DatasetController.java
@@ -72,9 +72,11 @@ public class DatasetController extends Controller{
 
     public void openDataset(){
         Dataset datasetToOpen = (Dataset) datasetView.getSelectionModel().getSelectedItem();
-        getParent().setCurrentDataset(datasetToOpen);
-        loadTable();
-        getParent().getMenuController().replaceSceneContent(getParent().getSession().getSceneDisplayed());
-        ((Stage) openDataset.getScene().getWindow()).close();
+        if (datasetToOpen != null) {
+            getParent().setCurrentDataset(datasetToOpen);
+            loadTable();
+            getParent().getMenuController().replaceSceneContent(getParent().getSession().getSceneDisplayed());
+            ((Stage) openDataset.getScene().getWindow()).close();
+        }
     }
 }