Used Eclipse Findbugs plugin. These changes are the result.