Merge "BUG: 6569 Exceptions thrown while removing mac-entries"