address findbugs
Merge pull request #74 from Netflix/findbugs

address findbugs