[SATYR PATCH 1/3] Fix potentially undefined return value