Fix NullReferenceException

Occasionally it happened inside
SafelyCloseRequest. It was safe as the method
should be, but not pleasant to checking for that.
Merge branch 'master' into sched
Backup work in progress