[TASK] Tiny performance improvement by earlier return, ConfigurationService