Manually handled this exception
Merge branch 'master' of https://github.com/crdschurch/crossroads.net
Merge branch 'master' of https://github.com/crdschurch/crossroads.net
post migrated message