A high-power laser system includes a laser master oscillator, a plurality of fiber laser amplifiers producing intermediate output beamlets, a diffractive optical element for combining the intermediate beamlets into a combined output beam, and one or more error controllers for minimizing errors related to beam combination that may degrade the quality of the combined output beam. A piston error controller uses phase modulation to tag each non-reference intermediate beamlet with a unique dither signal harmonically unrelated to those used for the other beamlets. For each intermediate beamlet, the associated piston error is recovered using a synchronous detector, and an error control signal proportional to the piston error is supplied to a phase modulator to control the piston error for that beamlet. A tilt error controller uses amplitude modulation based on Hadamard code words to tag each non-reference intermediate beamlet with a unique code sequence orthogonal to those used for the other beamlets. For each intermediate beamlet, the associated tilt error is recovered using a Hadamard decoder, and an error control signal proportional to the tilt error is supplied to a beam steerer to control the tilt error for that beamlet.