Improved error-checking
Fix arp_monitor