Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9965)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9966)
@@ -1437,5 +1437,5 @@
         if (loadedVersion < 9715) {
             Setting<?> setting = settingsMap.get("imagery.entries");
-            if (setting != null && setting instanceof MapListSetting) {
+            if (setting instanceof MapListSetting) {
                 List<Map<String, String>> l = new LinkedList<>();
                 boolean modified = false;
@@ -1462,5 +1462,5 @@
         if (loadedVersion < 9965) {
             Setting<?> setting = settingsMap.get("mappaint.style.entries");
-            if (setting != null && setting instanceof MapListSetting) {
+            if (setting instanceof MapListSetting) {
                 List<Map<String, String>> l = new LinkedList<>();
                 boolean modified = false;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java	(revision 9965)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java	(revision 9966)
@@ -92,5 +92,5 @@
 
         public void setValue(Object o) {
-            if (o == null || !(o instanceof Boolean)) {
+            if (!(o instanceof Boolean)) {
                 throw new IllegalArgumentException();
             }