fix #8987 - Fix NPE and Findbugs/Sonar violations

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6169 0c6e7542-c601-0410-84e7-c038aed88b3b