MP1-4334 : Fix Init loop issue and check null reference.