1.2.2 patch to fix return value when no result