Fixed prompts to not return null