Fixed unmention entities throwing exceptions "cannot cast to blah blah blah"
Merge pull request #708 from EXTERED/master

Fixed unmentioned entities throwing exceptions "cannot cast to blah blah blah"