diff --git a/pom.xml b/pom.xml
index 54e6f6d..58adb32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <groupId>com.drunkendev.confluence.plugins</groupId>
   <artifactId>attachment-tools-plugin</artifactId>
   <name>Attachment Tools Plugin</name>
-  <version>1.2.0-5.9-alpha-1</version>
+  <version>1.2.0-5.9-alpha-2</version>
 
   <properties>
     <confluence.version>5.9.6</confluence.version>
diff --git a/src/main/java/com/drunkendev/confluence/plugins/attachments/PurgeAttachmentsJob.java b/src/main/java/com/drunkendev/confluence/plugins/attachments/PurgeAttachmentsJob.java
index af8e818..e978c70 100644
--- a/src/main/java/com/drunkendev/confluence/plugins/attachments/PurgeAttachmentsJob.java
+++ b/src/main/java/com/drunkendev/confluence/plugins/attachments/PurgeAttachmentsJob.java
@@ -118,6 +118,7 @@ private Map<String, PurgeAttachmentSettings> getAllSpaceSettings(PurgeAttachment
         return spaceManager.getAllSpaceKeys(SpaceStatus.CURRENT).stream()
                 .filter(k -> k != null)
                 .map(k -> new ImmutablePair<>(k, getSettings(k, defaultSetting)))
+                .filter(n -> n.right != null)
                 .collect(toMap(k -> k.left, k -> k.right));
     }