fixed stats NullPointerException bug
Merge branch 'paddatrapper-master'