Change error return value to be more consistent with the rest of Python