0.9.13 - added entity checks to avoid error spam