ARMSTWO-179. RPP-82. Corrected logic so empty return fails condition.