Add exception handling to RS
Merge pull request #39 from collinday/bugfix/31

Add exception handling to RS