Yeah, dropping the `return` and moving it to the line below will be more safe I think.