Fix for NullPointerException

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