More error handling cleanup
More error handling cleanup

CS497-F15/dockersh,mehulsbhatt/dockersh,Yelp/dockersh,CS497-F15/dockersh,beni55/dockersh,chenrui2014/dockersh,pugna0/dockersh,chenrui2014/dockersh,mehulsbhatt/dockersh,Yelp/dockersh,pugna0/dockersh,beni55/dockersh