Handled NPE, updated javadoc, workaround for ÄÖÜ