Minor improvement in validation of configuration.

Change-Id: I8e342727e72db510a45b885ddb293ceef4590510