Make show route more defensive
Merge branch 'master' of github.com:pcrglennon/justin-peter