fix findbugs issues
Merge branch 'master' of https://github.com/molgenis/molgenis
add type check
Merge pull request #737 from dennishendriksen/master

Fix FindBugs issues