ATMEGA328 locks up on watchdog reset

Do you really need a bootloader? With an ICSP header on the board you can, via a programmer, load a sketch without one.