Return raw null as much as possible

yay for fallbacks