Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java	(revision 36494)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java	(revision 36495)
@@ -124,12 +124,9 @@
 
     public boolean handleAttributionCursor(Point p) {
-        if (attrTextBounds != null && attrTextBounds.contains(p)) {
-            return true;
-        } else if (attrImageBounds != null && attrImageBounds.contains(p)) {
-            return true;
-        } else if (attrToUBounds != null && attrToUBounds.contains(p)) {
-            return true;
-        }
-        return false;
+        if (p == null) return false;
+
+        return (attrTextBounds != null && attrTextBounds.contains(p))
+            || (attrImageBounds != null && attrImageBounds.contains(p))
+            || (attrToUBounds != null && attrToUBounds.contains(p));
     }