Exception clean-up and reduced dependency on JDO