Make sure proper error message is being displayed when problem/survey is
not found.
Merge branch 'improvements'