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



SVN revision: 45478

tasn/enlightenment,rvandegrift/e,tasn/enlightenment,tizenorg/platform.upstream.enlightenment,tizenorg/platform.upstream.enlightenment,FlorentRevest/Enlightenment,FlorentRevest/Enlightenment,rvandegrift/e,tasn/enlightenment,rvandegrift/e,FlorentRevest/Enlightenment,tizenorg/platform.upstream.enlightenment