Comment it, change it so that it works properly on errors