More Replacements
Fixing issue during replacements where a NULL pointer check was not performed.