Updated error and success reporting