Fix for NULL CF pointer.