Adding better error behavior to RS

Change-Id: Iea1cc76793f8978d60575404d7b1c5145e268d6e
6 files changed