Merge "Fix 2519335 - Caused by NPE.  Here's another place where it needs to be ok for sRS to be null."