Cleaning up Java compiler warnings
Merge pull request #482 from ajs6f/TooManyExceptions

Cleaning up Java compiler warnings