Simplify boot storage

OK, I created note why we need this check before if statement. It is a bit longer, because I describe also why it is correct.