The logic is a little more concise, and mac errors are handled correctly.
Avoid duplicate mac address errors.
QuickFix for murrowns pull request