r17863: Fix unneeded NULL check on pointer parameters causing the