Merge "Catch a resource not found exception" into sc-v2-dev