Pushed a commit to address @sethvargo's comment. I don't like wrapping the whole method in a conditional, so I kept the return.