And as a bonus tweak OATHModuleRegistry error handling. Change-Id: I4e3ca0092115e22ab7e7703e1682d68fbcc06af4