MLT-5496 separate patch for property of non-object error