Updated error checking and exception handling for instances that are misbheaving
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere