Don't set headers to None when they're empty