fix null serialization, should help with #1092
just in case
Merge branch 'i914-dipq'