Minor error handling cleanup, macro @ is now root.cfg