fix #9475 see #9470 - NPE on startup - java.lang.reflect.InvocationTargetException

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6535 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror