throw exception instead of die, fix/improve error message

line number is included for usability

and fix recomendation about the proper comments to use