diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
index 082720bf7..945bbd935 100644
--- a/lib/Doctrine/ORM/Tools/EntityGenerator.php
+++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -709,6 +709,15 @@ public function __construct()
             }
         }
 
+        // check traits for existing property
+        $reflClass = new \ReflectionClass($metadata->name);
+
+        foreach ($reflClass->getTraits() as $trait) {
+            if ($trait->hasProperty($property)) {
+                return true;
+            }
+        }
+
         return (
             isset($this->staticReflection[$metadata->name]) &&
             in_array($property, $this->staticReflection[$metadata->name]['properties'])
@@ -732,6 +741,15 @@ public function __construct()
             }
         }
 
+        // check traits for existing method
+        $reflClass = new \ReflectionClass($metadata->name);
+
+        foreach ($reflClass->getTraits() as $trait) {
+            if ($trait->hasMethod($method)) {
+                return true;
+            }
+        }
+
         return (
             isset($this->staticReflection[$metadata->name]) &&
             in_array($method, $this->staticReflection[$metadata->name]['methods'])