Nonetype error fixed for samples without replicates
Merge branch 'develop'