Added exceptions to fail patch