Typo + bugfix for error state
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere