Change of behaviour - modified exc catch
Merge pull request #533 from mfalesni/my_fixes

Change of behaviour - modified exc catch