exceptions fixed (i hope)

which may solve the trond problem. tests are required.