NULL fix in *await