Code review PR

Instead of assigning the result to answer and then checking for null and then returning answer, I would just implicitly return the result of the `match` and throw from the default case.