Fix possible NPE.
Bump to version 1.1.1.
Merge branch 'dev'