Improved skapa-modifiera-tabort feature to be more trustworthy