Optimized Javadoc and NPE handling.

Signed-off-by: Dennis Nobel <d.nobel@external.telekom.de>