...rather than a general RuntimeException, for consistency with existing service
ctor code.

Change-Id: Ia9ac14a1b5bcecb24394e7b9cade369f3f9303f0