Fixes #54 NPE in auto edit strategy