ExceptionMapping - changed RuntimeException to Exception
Merge pull request #569 from kazoompa/ExceptionMapping

ExceptionMapping - changed RuntimeException to Exception