Fixed exception handeling.  No longer using rescure StandardError