Updated response so that it always returns a valid promise