Added null check for content encoding in extras lookup