Removed faulty if statement to verify if the macaddr param is passed.  We always pass the mac address anyway.