Cleaned up some error messages