Merge "Adding better error behavior to RS" into graphics-dev