#60: Return a more logical response in the API