Fix #58 Exception after removing entity.