CFY-799 restore error capture the way it was before a better way of doing this is come up with