Aborting in the right place this time!