Avoid NPEs from object unpersistence order variance [1483]