Add null check for default value on get preferred header call
Merge branch 'daley', remote-tracking branch 'origin'