diff --git a/packages/ember-metal/lib/utils.js b/packages/ember-metal/lib/utils.js
index 86f6a17095c..2cdeffec2d5 100644
--- a/packages/ember-metal/lib/utils.js
+++ b/packages/ember-metal/lib/utils.js
@@ -201,6 +201,10 @@ export function generateGuid(obj, prefix) {
   @return {String} the unique guid for this instance.
 */
 export function guidFor(obj) {
+  if (obj && obj[GUID_KEY]) {
+    return obj[GUID_KEY];
+  }
+
   // special cases where we don't want to add a key to object
   if (obj === undefined) {
     return '(undefined)';
@@ -237,10 +241,6 @@ export function guidFor(obj) {
       return obj ? '(true)' : '(false)';
 
     default:
-      if (obj[GUID_KEY]) {
-        return obj[GUID_KEY];
-      }
-
       if (obj === Object) {
         return '(Object)';
       }