Catch not found exceptions
Added support for switching language again for logged in users
Merge branch 'development' into release/10