Cleaned up error messages and added support for severity