--- a/storage.js
+++ b/storage.js
@@ -288,17 +288,14 @@ storage.existsItem = function(nodeID, it
 };
 
 storage.getItem = function(nodeID, itemID) {
-	if (!storage.existsItem(nodeID, itemID))
-		return 42; //FIXME
-
-	var items = storage.existsItem(nodeID, itemID);
+	var items = storage.getItems(nodeID);
 	if (typeof items == 'number')
 		return items;
 
-	if (items)
-		return items.content;
+	if (items[itemID])
+		return items[itemID].content;
 
-	return errors.item_not_found;
+	return errors.success;
 };
 
 storage.getSubscription = function(jid, nodeID) {