Remove useless condition and add more check
Remove useless condition and add more check

kervinck/gigatron-rom,kervinck/gigatron-rom,kervinck/gigatron-rom,kervinck/gigatron-rom,kervinck/gigatron-rom,kervinck/gigatron-rom,kervinck/gigatron-rom