Remove old error check