Fixed error when weight not available
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from MattSkala/master

Fixed error when weight not available