From f479e914bbb02dafccc2d904836f445440487454 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Wed, 8 Apr 2015 11:58:46 +0200
Subject: [PATCH] #getId() should behave even if the item is null or undefined.

---
 packages/xo-collection/src/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/xo-collection/src/index.js b/packages/xo-collection/src/index.js
index 82fd0bbcf..49e5dd804 100644
--- a/packages/xo-collection/src/index.js
+++ b/packages/xo-collection/src/index.js
@@ -90,7 +90,7 @@ export default class Collection extends EventEmitter {
   }
 
   getId (item) {
-    return item.id
+    return item && item.id
   }
 
   has (key) {
@@ -99,9 +99,7 @@ export default class Collection extends EventEmitter {
 
   _resolveItem (keyOrObjectWithId, valueIfKey = null) {
     let value
-    let key = (undefined !== keyOrObjectWithId) ?
-      this.getId(keyOrObjectWithId) :
-      undefined
+    let key = this.getId(keyOrObjectWithId)
 
     if (undefined === key) {
       if (arguments.length < 2) {