Simplify method names displayed on the output
Tweaked error handling