Better error handling, include comment body in output
Added caveat