Refactoring. Added Exception Handling shell code.
Merge remote-tracking branch 'origin/master'