Making changes to handle genteic error messages.