Improve base entity to handle deletion of obj property during saving.