diff --git a/CHANGES.txt b/CHANGES.txt
index 465bc9d..c870e4a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -110,6 +110,8 @@
   OPTIMIZATIONS
 
   BUG FIXES
+    FALCON-1804 Non-SLA feed throws NullPointerException (Sandeep Samudrala via Pallavi Rao)
+
     FALCON-1782 Client returns FalconWebException instead of the expected error message(Praveen Adlakha via Ajay Yadava)
 
     FALCON-1747 Falcon instance status listing is throwing error message (Peeyush Bishnoi)
diff --git a/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java b/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java
index b720c77..2b76876 100644
--- a/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java
+++ b/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java
@@ -270,7 +270,9 @@
         LOG.info("Removing {} feed's instance {} in cluster {} from pendingSLA", feedName,
                 clusterName, nominalTime);
         Pair<String, String> feedCluster = new Pair<>(feedName, clusterName);
-        pendingInstances.get(feedCluster).remove(nominalTime);
+        if (pendingInstances.get(feedCluster) != null) {
+            pendingInstances.get(feedCluster).remove(nominalTime);
+        }
     }
 
     private FileSystem initializeFileSystem() {