Cleaned up Error class