Without that check we may get firmware: null that will be a mistake Change-Id: Ib86a5ff7b54a6a280768832646f612568da93046