Fixes inline editing sometimes showing NPE because it was trying to edit an embedded object.