I can use the debugedit from Factory, but I'm not sure it fixes things. The diff is rather small and it mostly is added error checking. Should we try this?