Added exception rescue