be more defensive in the code
Merge branch 'master' of https://github.com/balloonchallenge/balloonchallenge.org
Merge branch 'krish-frontend'