further removal of unnecessary exception throw.
Merge pull request #84 from mmoadeli/MAID-BUG-FIX8

further removal of unnecessary exception throw.