Fixed returning an api response too soon in the call chain.