Fix missing return statement (OMS-369)