diff --git a/pyamf/adapters/_sqlalchemy_orm.py b/pyamf/adapters/_sqlalchemy_orm.py
index cb562a3e..52474f9c 100644
--- a/pyamf/adapters/_sqlalchemy_orm.py
+++ b/pyamf/adapters/_sqlalchemy_orm.py
@@ -22,7 +22,7 @@
 
 try:
     class_mapper(dict)
-except Exception, e:
+except Exception as e:
     UnmappedInstanceError = e.__class__
 
 
diff --git a/pyamf/remoting/__init__.py b/pyamf/remoting/__init__.py
index 7e8fc95c..b106429c 100644
--- a/pyamf/remoting/__init__.py
+++ b/pyamf/remoting/__init__.py
@@ -176,7 +176,7 @@ def __iter__(self):
         for body in self.bodies:
             yield body[0], body[1]
 
-        raise StopIteration
+        return
 
     def __len__(self):
         return len(self.bodies)
@@ -185,7 +185,7 @@ def iteritems(self):
         for body in self.bodies:
             yield body
 
-        raise StopIteration
+        return
 
     def keys(self):
         return [body[0] for body in self.bodies]