removed raise condition