diff --git a/doc/changelog.txt b/doc/changelog.txt
index 2c577b421..d242070b6 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,15 @@ Minetest-c55 changelog
 This should contain all the major changes.
 For minor stuff, refer to the commit log of the repository.
 
+X:
+- Ladders
+- Lava
+- /me chat command
+- Slightly better looking inventory (transparency)
+- Fix the long-existed PeerNotFound loop bug
+- Some translations and localization-related fixes
+- Lots of small fixes, once again
+
 2011-07-31_3:
 - Fixes a bug that made the server to deny non-empty passwords from players connecting the first time
 
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index d29eea661..e8f1e197e 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -293,7 +293,7 @@ bool FurnaceNodeMetadata::step(float dtime)
 			If there is no source item or source item is not cookable,
 			or furnace became overloaded, stop loop.
 		*/
-		if((m_fuel_time < m_fuel_totaltime || dst_list->roomForCookedItem(src_item) == false)
+		if((m_fuel_time < m_fuel_totaltime || (src_item && dst_list->roomForCookedItem(src_item) == false))
 			&& (src_item == NULL || m_src_totaltime < 0.001))
 		{
 			m_step_accumulator = 0;
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 62aedb536..116ceeb6d 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -581,6 +581,8 @@ bool InventoryList::roomForItem(const InventoryItem *item)
 
 bool InventoryList::roomForCookedItem(const InventoryItem *item)
 {
+	if(!item)
+		return false;
 	const InventoryItem *cook = item->createCookResult();
 	if(!cook)
 		return false;