Fix NPE when guU verification fails

The API client will return null if the verification
fails. Unfortunately, mapping Some(a) with f(a) = b results in Some(b)
rather than Option(b). This means you end up with Some(null) rather
than the expected None.

We now use a match statement to return Option(b) explicitly.