Added check to handle null Squad in upgrdae