Decoupled recovery of energy and momentum with correction of n  =  2 error fields