Don't we want to do this null check here just like in the Httpruntime one?