Code cleanup, improved Exception handling (forgot to commit this dir)
Authored by: arne_m 2008-04-10
Parent: [r19]
Child: [r21]