Er, refactoring with clipse - was mistake.
Shuffled things back to where they must be.
Another attempt to wrap it all in try-catch blocks.
As I said, shuffled things back to where I found them.