changes for exceptions mechanism - server side