Handled some error conditions!
Merge branch 'master' of https://github.com/tnewman/Project-Helios