EPP error refactor (once again)