removed raise and changed successfull? logic