Return raw null even more

Yay more for fallbacks