Modify Exception Handling #5

/ Solution to issue #5