Merge "Not found exception was in the wrong place."