Index: /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideMainDialog.java
===================================================================
--- /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideMainDialog.java	(revision 35201)
+++ /applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideMainDialog.java	(revision 35202)
@@ -535,10 +535,12 @@
 	public void selectedImageChanged(StreetsideAbstractImage oldImage, StreetsideAbstractImage newImage) {
 		setImage(newImage);
-		if (newImage.getSequence() != null && newImage.next()!=null) {
-      nextButton.setEnabled(true);
-    }
-    if (newImage.getSequence() != null && newImage.previous()!=null) {
-      previousButton.setEnabled(true);
-    }
+		if (newImage != null && newImage.getSequence() != null) {
+	        if (newImage.next() != null) {
+	            nextButton.setEnabled(true);
+	        }
+	        if (newImage.previous() != null) {
+	            previousButton.setEnabled(true);
+	        }
+        }
 		updateImage();
 	}
