Refactored code to avoid a deprecation warning in Python 2.7
Removed the un-needed raise call
Merge pull request #41 from epicserve/py27_deprecation_fix

Refactored code to avoid a deprecation warning in Python 2.7