diff --git a/src/main/java/com/rarchives/ripme/ui/MainWindow.java b/src/main/java/com/rarchives/ripme/ui/MainWindow.java
index 92b8071c..48e8d836 100644
--- a/src/main/java/com/rarchives/ripme/ui/MainWindow.java
+++ b/src/main/java/com/rarchives/ripme/ui/MainWindow.java
@@ -1183,13 +1183,15 @@ public final class MainWindow implements Runnable, RipStatusHandler {
                 // Guess rip history based on rip folder
                 String[] dirs = Utils.getWorkingDirectory()
                         .list((dir, file) -> new File(dir.getAbsolutePath() + File.separator + file).isDirectory());
-                for (String dir : dirs) {
-                    String url = RipUtils.urlFromDirectoryName(dir);
-                    if (url != null) {
-                        // We found one, add it to history
-                        HistoryEntry entry = new HistoryEntry();
-                        entry.url = url;
-                        HISTORY.add(entry);
+                if (dirs != null) {
+                    for (String dir : dirs) {
+                        String url = RipUtils.urlFromDirectoryName(dir);
+                        if (url != null) {
+                            // We found one, add it to history
+                            HistoryEntry entry = new HistoryEntry();
+                            entry.url = url;
+                            HISTORY.add(entry);
+                        }
                     }
                 }
             }