Also check for chafed (sp?) wires going into the headlight bucket. A lot of times the rubber grommet will come loose and the wires will rub. Usually shorts out...
Another thing I've had happen is a wire brike right AT the main connector inside the headlight bucket. I didn't have enough wire to solder to, so I soldered a quick connect onto the broken wire, cut the wire it connects to on the opposing side of the connector, and put a quick connect on that too, made a jumper.