OS-549, unused exceptions removed, code refactored
Merge pull request #24 from Vegasq/OS-549

OS-549, unused exceptions removed