Fix for case where type is null, move to aws sdk trunk for now