Fixing bugs that caused no callback to propagate on error