Feature 3229: Working on exception handling