Removing custom error types to reduce complexity