Feature #2368 - adding exceptions support