Throw checked exception
Fix misleading/wrong log message
Merge branch 'develop'