diff -r 81c128f487e6 -r be1b94099f2d thirdparty/google_appengine/google/appengine/api/apiproxy_rpc.py
--- a/thirdparty/google_appengine/google/appengine/api/apiproxy_rpc.py	Tue May 12 13:02:10 2009 +0200
+++ b/thirdparty/google_appengine/google/appengine/api/apiproxy_rpc.py	Tue May 12 15:39:52 2009 +0200
@@ -89,11 +89,12 @@
     assert self.__state is RPC.IDLE, ('RPC for %s.%s has already been started' %
                                       (self.package, self.call))
     assert self.callback is None or callable(self.callback)
-
     self._MakeCallImpl()
 
   def Wait(self):
     """Waits on the API call associated with this RPC."""
+    assert self.__state is not RPC.IDLE, ('RPC for %s.%s has not been started' %
+                                          (self.package, self.call))
     rpc_completed = self._WaitImpl()
 
     assert rpc_completed, ('RPC for %s.%s was not completed, and no other ' +