Merge pull request #1552 from madpilot78/Avoid_passing_NULL_to_vprintf