Sholudn't be necessary once you sort out error handling in the proto-store code above.