Comments
Changed to more generic exception check
Added more bootstrapping for user