fix issue with handling return with no API key