Fix deleting entity with modified field

fixes #1237
Capture better stack traces