Fix for uncaught exception error for 404 errors
Merge remote-tracking branch 'upstream/dev' into dev