Added test for server-side exception
Merge remote-tracking branch 'origin/database_branch' into database_branch