Fixes for LLADDR="00:00:00:00:00:00"

Should address at least: bnc#889287, bnc#898620


that probably is the thing I do a couple of lines bellow ... 

thanks this looks better.