[MAT-355] further bad_alloc protection