--- albatross-1.10pre2/albatross/fcgiapp.py	2003-07-05 04:12:16.000000000 +0100
+++ albatross-1.10pre2-patched/albatross/fcgiapp.py	2003-07-07 23:03:53.000000000 +0100
@@ -19,14 +19,14 @@
         cgiapp.Request.__init__(self, fields)
                                                          
     def get_uri(self):
-        return self.__fcgi.env['REQUEST_URI']
+        return self.__fcgi.env.get('REQUEST_URI')
                                                                      
     def get_servername(self):
-        return self.__fcgi.env['SERVER_NAME']
+        return self.__fcgi.env.get('SERVER_NAME')
 
     def get_header(self, name):
         env_name = 'HTTP_' + name.upper().replace('-', '_')
-        return self.__req.env.get(env_name)
+        return self.__fcgi.env.get(env_name)
                                                      
 
 def running():
