Fix some strange NullPointerException
Prepare release 1.1.1