Changed nil check and removed set archive