Clean up the mac address before saving
Added additional check