GATEWAY-3447: missed some constructors that passed null.