Fixed #188. Made one change as recommended by findbugs and excluded three false positives.