Add misisng safeguards & remove useless git commit hashes

[nickveenhof]

These safeguards were missing causing errors when generating the prompts in cases where some of the information was not available.