Add Error Messages

Nice refactoring.