MP1-4068 : Fix exception for OnAdded().