Added comments and improved an error's description
Added another error case