fixed issues with error checking
Merge branch 'master' of ssh://github.com/redhotlabs/zuck