Enhance status code returned