Index: trunk/scripts/SyncEditorLayerIndex.java
===================================================================
--- trunk/scripts/SyncEditorLayerIndex.java	(revision 18208)
+++ trunk/scripts/SyncEditorLayerIndex.java	(revision 18211)
@@ -962,5 +962,5 @@
             if (Utils.isEmpty(jh)) {
                 myprintln("- Missing JOSM no tile headers ("+eh+"): "+getDescription(j));
-            } else if (eh != null && !eh.isEmpty()) {
+            } else if (!Utils.isEmpty(eh)) {
                 myprintln("* No tile headers differ ('"+eh+"' != '"+jh+"'): "+getDescription(j));
             } else if (!optionNoEli) {
@@ -1589,9 +1589,9 @@
         String id = getId(o);
         String d = cc;
-        if (name != null && !name.isEmpty()) {
+        if (!Utils.isEmpty(name)) {
             d += name;
-            if (id != null && !id.isEmpty())
+            if (!Utils.isEmpty(id))
               d += " ["+id+"]";
-        } else if (url != null && !url.isEmpty())
+        } else if (!Utils.isEmpty(url))
             d += url;
         if (optionShorten) {