Removed Java7 specific exception handling