Reorganize, catch errors.