Add safety code.
Merge branch 'master' of github.com:kylc/exo