Gracefully handle having too little data
Merge pull request #2 from bettse/master

Gracefully handle having too little data