Quick fix for .then doing implicitly unwrapping of clients