Added fallback scenarios when values not found or incorrect