Adjusted the wawy exceptions are handled in some of the cases on my JUnit tests as they are sometimes picked up by findbugs unnecessarily