Created by: m4tthumphrey
Not sure what happened here but looks like my original change was overwritten by the recent return code updates.
