more deleteTimer NULL protection
Merge branch 'master' into Reader