Updates code to be a little more resilient
Fixes build
Merge branch 'master' of github.com:socialreferral/guard-process