Updated to correctly handle no configuration.