fixed issues with error handling
Merge branch 'master' of https://github.com/anikan/CalHacks