Move 'error' keys to correct place.