Alter the error logic handling