Improve error case handling / output
Fix spacing