(Griffin) Add NULL ifdefs for Griffin