Fix a NPE
Bump version
Finish Hotfix-1.6.0-alpha.7