Going to merge against develop, per the suggestion from @mwillbanks -- changes in exception messages can have ramifications.