Updating to not throw when T is undefined