a little more error handling
Merge branch 'master' of github.com:isaacdontjelindell/pi-data