Removed wrong error processing