diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java
index 5fffcab2a..d5eb05851 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java
@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.nearby;
 
+import android.support.annotation.NonNull;
+
 import com.pedrogomez.renderers.ListAdapteeCollection;
 import com.pedrogomez.renderers.RVRendererAdapter;
 import com.pedrogomez.renderers.RendererBuilder;
@@ -10,7 +12,7 @@ import java.util.List;
 class NearbyAdapterFactory {
     private PlaceRenderer.PlaceClickedListener listener;
 
-    NearbyAdapterFactory(PlaceRenderer.PlaceClickedListener listener) {
+    NearbyAdapterFactory(@NonNull PlaceRenderer.PlaceClickedListener listener) {
         this.listener = listener;
     }
 
diff --git a/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java b/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java
index e54e4d7f2..76125aa43 100644
--- a/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java
+++ b/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java
@@ -113,14 +113,6 @@ public class NearbyAdapterFactoryTest {
         assertEquals(PLACE, clickedPlace);
     }
 
-    @Test
-    public void clickViewHandlesMisconfiguredListener() {
-        NearbyAdapterFactory testObject = new NearbyAdapterFactory(null);
-        RVRendererAdapter<Place> result = testObject.create(Collections.singletonList(PLACE));
-        RendererViewHolder viewHolder = renderComponent(result);
-        viewHolder.itemView.performClick();
-    }
-
     @NonNull
     private RendererViewHolder renderComponent(RVRendererAdapter<Place> result) {
         FrameLayout viewGroup = new FrameLayout(RuntimeEnvironment.application);