Hardened the RID regexp: `#1:1` is a valid RID - `something#1:1something` is not.
CONFIG_LIST
Merge remote-tracking branch 'upstream/master'
Replaced all string errors with instances of Error.