diff --git a/itests/org.openhab.binding.feed.tests/src/main/java/org/openhab/binding/feed/test/FeedHandlerTest.java b/itests/org.openhab.binding.feed.tests/src/main/java/org/openhab/binding/feed/test/FeedHandlerTest.java
index d25a832d0..d2af30702 100644
--- a/itests/org.openhab.binding.feed.tests/src/main/java/org/openhab/binding/feed/test/FeedHandlerTest.java
+++ b/itests/org.openhab.binding.feed.tests/src/main/java/org/openhab/binding/feed/test/FeedHandlerTest.java
@@ -169,11 +169,13 @@ public class FeedHandlerTest extends JavaOSGiTest {
 
         unregisterFeedTestServlet();
 
-        // Wait for FeedHandler to be unregistered
-        waitForAssert(() -> {
-            feedHandler = (FeedHandler) feedThing.getHandler();
-            assertThat(feedHandler, is(nullValue()));
-        });
+        if (feedThing != null) {
+            // Wait for FeedHandler to be unregistered
+            waitForAssert(() -> {
+                feedHandler = (FeedHandler) feedThing.getHandler();
+                assertThat(feedHandler, is(nullValue()));
+            });
+        }
     }
 
     private synchronized void registerFeedTestServlet() {