Refactored the error return shizzle