Fix a potential NPE when samples are null.
Merge branch 'stable' of github.com:CampagneLaboratory/goby into stable