Fix #99

Fixes the NULL entity error I posted in #99.

Please update the workshop when you have a moment, the issue is fairly common.