Protect against NULL funcs
2 files changed