Added extra safety checks in "isComplete" for #474