Reinstate the KDF error macros