Fixes #1329
Prevent NPE
Fixes #1327
Embarassing
Remove logging
Improve logging
Fixed #1332
Fixes #1334
Fixes #1334
Cosmetic
Fixes #1333