Reduce variable usage. Add additional error trapping.
Reduce variable usage.
Add additional error trapping.



git-svn-id: 6ac5796aeae0cef97fb47bcc287d4ce899c6fa6e@45478 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

jordemort/e17,jordemort/e17,jordemort/e17