diff --git a/modules/services/panoramax.js b/modules/services/panoramax.js
index 20240551e..364e2f2b0 100644
--- a/modules/services/panoramax.js
+++ b/modules/services/panoramax.js
@@ -488,7 +488,6 @@ export default {
             _currentFrame
                 .selectPhoto(d, true)
                 .showPhotoFrame(wrap);
-
         });
 
         function localeDateString(s) {
@@ -592,9 +591,10 @@ export default {
 
                 const nextImage = _cache.images.forImageId[nextId];
 
-                context.map().centerEase(nextImage.loc);
-
-                that.selectImage(context, nextImage.id);
+                if (nextImage){
+                    context.map().centerEase(nextImage.loc);
+                    that.selectImage(context, nextImage.id);
+                }
             };
         }