Fix for NullPointerException

This is otherwise not the bean you expect ;)
Hope this works, did the change directly in the GitHub editor.