ok, I'll change it to propagate error immediately