Temporary fix for tiger NRE on death, the proper fix will be shelved and merged post patch, as the bug unearthed a deeper bug in entityComponent whose fix could create other bugs