Minor fixes so that tests run.

Change-Id: I5fcaa8b0d0aef67af66da3f2f229cb86c4671e8a
Fail gracefully when configuration is missing.

This can occur in tests.

Change-Id: If28a63e146441fd1e0bf265bd7f27bda976d6519