Instead of having most of this method in an `else` block, replace the `return None` with `returnValue(None)` and keep the original structure.