Index: applications/editors/josm/plugins/pointInfo/build.xml
===================================================================
--- applications/editors/josm/plugins/pointInfo/build.xml	(revision 36202)
+++ applications/editors/josm/plugins/pointInfo/build.xml	(revision 36203)
@@ -3,5 +3,5 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="PointInfo: Fix NPE issue"/>
+    <property name="commit.message" value="PointInfo: Fix yet another NPE issue with empty strings"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="18723"/>
Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java
===================================================================
--- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java	(revision 36202)
+++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java	(revision 36203)
@@ -216,5 +216,5 @@
 
             try {
-                mObjektRuianId = Long.parseLong(stavebniObjekt.getString("ruian_id", null));
+                mObjektRuianId = Long.parseLong(stavebniObjekt.getString("ruian_id", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "stavebni_objekt.ruian_id:", e);
@@ -222,5 +222,5 @@
 
             try {
-                mObjektPodlazi = Integer.parseInt(stavebniObjekt.getString("pocet_podlazi", null));
+                mObjektPodlazi = Integer.parseInt(stavebniObjekt.getString("pocet_podlazi", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "stavebni_objekt.pocet_podlazi:", e);
@@ -228,20 +228,20 @@
 
             try {
-                mObjektByty = Integer.parseInt(stavebniObjekt.getString("pocet_bytu", null));
+                mObjektByty = Integer.parseInt(stavebniObjekt.getString("pocet_bytu", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "stavebni_objekt.pocet_bytu:", e);
             }
 
-            mObjektZpusobVyuziti = stavebniObjekt.getString("zpusob_vyuziti", null);
-
-            mObjektZpusobVyuzitiKod = stavebniObjekt.getString("zpusob_vyuziti_kod", null);
-
-            mObjektZpusobVyuzitiKey = stavebniObjekt.getString("zpusob_vyuziti_key", null);
-
-            mObjektZpusobVyuzitiVal = stavebniObjekt.getString("zpusob_vyuziti_val", null);
-
-            mObjektPlatiOd = stavebniObjekt.getString("plati_od", null);
-
-            mObjektDokonceni = stavebniObjekt.getString("dokonceni", null);
+            mObjektZpusobVyuziti = stavebniObjekt.getString("zpusob_vyuziti", "");
+
+            mObjektZpusobVyuzitiKod = stavebniObjekt.getString("zpusob_vyuziti_kod", "");
+
+            mObjektZpusobVyuzitiKey = stavebniObjekt.getString("zpusob_vyuziti_key", "");
+
+            mObjektZpusobVyuzitiVal = stavebniObjekt.getString("zpusob_vyuziti_val", "");
+
+            mObjektPlatiOd = stavebniObjekt.getString("plati_od", "");
+
+            mObjektDokonceni = stavebniObjekt.getString("dokonceni", "");
 
         } catch (IllegalArgumentException e) {
@@ -254,11 +254,11 @@
             JsonObject errObjekt = getSafeJsonObject(obj, "nahlaseny_problem");
 
-            mErrUser = errObjekt.getString("uzivatel", null);
-
-            mErrDate = errObjekt.getString("datum", null);
-
-            mErrType = errObjekt.getString("duvod", null);
-
-            mErrNote = errObjekt.getString("poznamka", null);
+            mErrUser = errObjekt.getString("uzivatel", "");
+
+            mErrDate = errObjekt.getString("datum", "");
+
+            mErrType = errObjekt.getString("duvod", "");
+
+            mErrNote = errObjekt.getString("poznamka", "");
 
         } catch (IllegalArgumentException e) {
@@ -276,5 +276,5 @@
 
                 try {
-                    so.setRuianID(Long.parseLong(soBezGeom.getString("ruian_id", null)));
+                    so.setRuianID(Long.parseLong(soBezGeom.getString("ruian_id", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "so_bez_geometrie.ruian_id:", e);
@@ -282,5 +282,5 @@
 
                 try {
-                    so.setPodlazi(Integer.parseInt(soBezGeom.getString("pocet_podlazi", null)));
+                    so.setPodlazi(Integer.parseInt(soBezGeom.getString("pocet_podlazi", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "so_bez_geometrie.pocet_podlazi:", e);
@@ -288,23 +288,23 @@
 
                 try {
-                    so.setByty(Integer.parseInt(soBezGeom.getString("pocet_bytu", null)));
+                    so.setByty(Integer.parseInt(soBezGeom.getString("pocet_bytu", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "so_bez_geometrie.pocet_bytu:", e);
                 }
 
-                so.setZpusobVyuziti(soBezGeom.getString("zpusob_vyuziti", null));
-
-                so.setZpusobVyuzitiKod(soBezGeom.getString("zpusob_vyuziti_kod", null));
-
-                so.setZpusobVyuzitiKey(soBezGeom.getString("zpusob_vyuziti_key", null));
-
-                so.setZpusobVyuzitiVal(soBezGeom.getString("zpusob_vyuziti_val", null));
-
-                so.setDokonceni(soBezGeom.getString("dokonceni", null));
-
-                so.setPlatiOd(soBezGeom.getString("plati_od", null));
-
-                try {
-                    so.setVzdalenost(Float.parseFloat(soBezGeom.getString("vzdalenost", null)));
+                so.setZpusobVyuziti(soBezGeom.getString("zpusob_vyuziti", ""));
+
+                so.setZpusobVyuzitiKod(soBezGeom.getString("zpusob_vyuziti_kod", ""));
+
+                so.setZpusobVyuzitiKey(soBezGeom.getString("zpusob_vyuziti_key", ""));
+
+                so.setZpusobVyuzitiVal(soBezGeom.getString("zpusob_vyuziti_val", ""));
+
+                so.setDokonceni(soBezGeom.getString("dokonceni", ""));
+
+                so.setPlatiOd(soBezGeom.getString("plati_od", ""));
+
+                try {
+                    so.setVzdalenost(Float.parseFloat(soBezGeom.getString("vzdalenost", "")));
                 } catch (NumberFormatException e) {
                     Logging.warn("so_bez_geometrie.vzdalenost: {0}", e);
@@ -327,5 +327,5 @@
 
                 try {
-                    am.setRuianID(Long.parseLong(adresniMisto.getString("ruian_id", null)));
+                    am.setRuianID(Long.parseLong(adresniMisto.getString("ruian_id", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.ruian_id:", e);
@@ -345,67 +345,67 @@
 
                 try {
-                    am.setBudovaID(Long.parseLong(adresniMisto.getString("budova_kod", null)));
+                    am.setBudovaID(Long.parseLong(adresniMisto.getString("budova_kod", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.budova_kod:", e);
                 }
 
-                am.setCisloTyp(adresniMisto.getString("cislo_typ", null));
-
-                am.setCisloDomovni(adresniMisto.getString("cislo_domovni", null));
-
-                am.setCisloOrientacni(adresniMisto.getString("cislo_orientacni", null));
-
-                try {
-                    am.setUliceID(Long.parseLong(adresniMisto.getString("ulice_kod", null)));
+                am.setCisloTyp(adresniMisto.getString("cislo_typ", ""));
+
+                am.setCisloDomovni(adresniMisto.getString("cislo_domovni", ""));
+
+                am.setCisloOrientacni(adresniMisto.getString("cislo_orientacni", ""));
+
+                try {
+                    am.setUliceID(Long.parseLong(adresniMisto.getString("ulice_kod", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.ulice_kod:", e);
                 }
 
-                am.setUlice(adresniMisto.getString("ulice", null));
-
-                try {
-                    am.setCastObceID(Long.parseLong(adresniMisto.getString("cast_obce_kod", null)));
+                am.setUlice(adresniMisto.getString("ulice", ""));
+
+                try {
+                    am.setCastObceID(Long.parseLong(adresniMisto.getString("cast_obce_kod", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.cast_obce_kod:", e);
                 }
 
-                am.setCastObce(adresniMisto.getString("cast_obce", null));
-
-                try {
-                    am.setMestskaCastID(Long.parseLong(adresniMisto.getString("mestska_cast_kod", null)));
+                am.setCastObce(adresniMisto.getString("cast_obce", ""));
+
+                try {
+                    am.setMestskaCastID(Long.parseLong(adresniMisto.getString("mestska_cast_kod", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.mestska_cast_kod:", e);
                 }
 
-                am.setMestskaCast(adresniMisto.getString("mestska_cast", null));
-
-                try {
-                    am.setObecID(Long.parseLong(adresniMisto.getString("obec_kod", null)));
+                am.setMestskaCast(adresniMisto.getString("mestska_cast", ""));
+
+                try {
+                    am.setObecID(Long.parseLong(adresniMisto.getString("obec_kod", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.obec_kod:", e);
                 }
 
-                am.setObec(adresniMisto.getString("obec", null));
-
-                try {
-                    am.setOkresID(Long.parseLong(adresniMisto.getString("okres_kod", null)));
+                am.setObec(adresniMisto.getString("obec", ""));
+
+                try {
+                    am.setOkresID(Long.parseLong(adresniMisto.getString("okres_kod", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.okres_kod:", e);
                 }
 
-                am.setOkres(adresniMisto.getString("okres", null));
-
-                try {
-                    am.setKrajID(Long.parseLong(adresniMisto.getString("kraj_kod", null)));
+                am.setOkres(adresniMisto.getString("okres", ""));
+
+                try {
+                    am.setKrajID(Long.parseLong(adresniMisto.getString("kraj_kod", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.kraj_kod:", e);
                 }
 
-                am.setKraj(adresniMisto.getString("kraj", null));
-
-                am.setPsc(adresniMisto.getString("psc", null));
-
-                try {
-                    am.setVzdalenost(Float.parseFloat(adresniMisto.getString("vzdalenost", null)));
+                am.setKraj(adresniMisto.getString("kraj", ""));
+
+                am.setPsc(adresniMisto.getString("psc", ""));
+
+                try {
+                    am.setVzdalenost(Float.parseFloat(adresniMisto.getString("vzdalenost", "")));
                 } catch (NumberFormatException e) {
                     Logging.log(Level.WARNING, "adresni_mista.vzdalenost:", e);
@@ -424,14 +424,14 @@
 
             try {
-                mParcelaRuianId = Long.parseLong(parcela.getString("ruian_id", null));
+                mParcelaRuianId = Long.parseLong(parcela.getString("ruian_id", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "parcela.ruian_id:", e);
             }
 
-            mParcelaDruhPozemku = parcela.getString("druh_pozemku", null);
-
-            mParcelaZpusobVyuziti = parcela.getString("zpusob_vyuziti", null);
-
-            mParcelaPlatiOd = parcela.getString("plati_od", null);
+            mParcelaDruhPozemku = parcela.getString("druh_pozemku", "");
+
+            mParcelaZpusobVyuziti = parcela.getString("zpusob_vyuziti", "");
+
+            mParcelaPlatiOd = parcela.getString("plati_od", "");
         } catch (InvalidArgumentException e) {
             Logging.log(Level.WARNING, "parcela:", e);
@@ -444,10 +444,10 @@
 
             try {
-                mUliceRuianId = Long.parseLong(ulice.getString("ruian_id", null));
+                mUliceRuianId = Long.parseLong(ulice.getString("ruian_id", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "ulice.ruian_id:", e);
             }
 
-            mUliceJmeno = ulice.getString("jmeno", null);
+            mUliceJmeno = ulice.getString("jmeno", "");
 
         } catch (IllegalArgumentException e) {
@@ -461,34 +461,34 @@
 
             try {
-                mKatastrRuianId = Long.parseLong(katastr.getString("ruian_id", null));
+                mKatastrRuianId = Long.parseLong(katastr.getString("ruian_id", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "katastr.ruian_id:", e);
             }
 
-            mKatastrNazev = katastr.getString("nazev", null);
-
-            try {
-                mKatastrObecKod = Long.parseLong(katastr.getString("obec_kod", null));
+            mKatastrNazev = katastr.getString("nazev", "");
+
+            try {
+                mKatastrObecKod = Long.parseLong(katastr.getString("obec_kod", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "katastr.obec_kod:", e);
             }
 
-            mKatastrObec = katastr.getString("obec", null);
-
-            try {
-                mKatastrOkresKod = Long.parseLong(katastr.getString("okres_kod", null));
+            mKatastrObec = katastr.getString("obec", "");
+
+            try {
+                mKatastrOkresKod = Long.parseLong(katastr.getString("okres_kod", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "katastr.okres_kod:", e);
             }
 
-            mKatastrOkres = katastr.getString("okres", null);
-
-            try {
-                mKatastrKrajKod = Long.parseLong(katastr.getString("kraj_kod", null));
+            mKatastrOkres = katastr.getString("okres", "");
+
+            try {
+                mKatastrKrajKod = Long.parseLong(katastr.getString("kraj_kod", ""));
             } catch (NumberFormatException e) {
                 Logging.log(Level.WARNING, "katastr.kraj_kod:", e);
             }
 
-            mKatastrKraj = katastr.getString("kraj", null);
+            mKatastrKraj = katastr.getString("kraj", "");
 
         } catch (IllegalArgumentException e) {