better error handling
Merge branch 'master' of github.com:siteleaf/siteleaf-gem