If we're not returning anything, we should fix the return earlier in this function as well.