Could you return this value in the catch() clause? Then we wouldn't need the boolean isVanilla at all