Remove Error throwing