Cleaned up errors