Added failure conditions