Handle NotFound in the proper manner.
Merge branch 'development'