Merge pull request #644 from joemphilips/improve_error_message