Made functions more eager to make the failure easier to track
Merge branch 'master' of github.com:SeanConnell/windwatchdb