Merge "Add additional shielding against the ERROR macro."