Added isset to else if