diff --git a/Android.mk b/Android.mk
index 2fe241a..9ec1301 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@ LOCAL_MODULE := recovery
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
-RECOVERY_VERSION := ClockworkMod Recovery v4.0.0.4
+RECOVERY_VERSION := ClockworkMod Recovery v4.0.0.5
 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
 RECOVERY_API_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
@@ -88,7 +88,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_SYMLINKS)
 # Now let's do recovery symlinks
 BUSYBOX_LINKS := $(shell cat external/busybox/busybox-minimal.links)
 ifndef BOARD_HAS_SMALL_RECOVERY
-exclude := tune2fs
+exclude := tune2fs mke2fs
 endif
 RECOVERY_BUSYBOX_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS))))
 $(RECOVERY_BUSYBOX_SYMLINKS): BUSYBOX_BINARY := busybox
diff --git a/extendedcommands.c b/extendedcommands.c
index d0b9302..06a230f 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -414,8 +414,7 @@ int format_unknown_device(const char *device, const char* path, const char *fs_t
 {
     LOGI("Formatting unknown device.\n");
 
-    // device may simply be a name, like "system"
-    if (get_flash_type(fs_type) != UNSUPPORTED)
+    if (fs_type != NULL && get_flash_type(fs_type) != UNSUPPORTED)
         return erase_raw_partition(fs_type, device);
 
     // if this is SDEXT:, don't worry about it if it does not exist.