diff --git a/common/console.c b/common/console.c
index 4127e76..74fb684 100644
--- a/common/console.c
+++ b/common/console.c
@@ -375,7 +375,7 @@
 	ret = devfs_create(&newcdev->devfs);
 
 	if (ret) {
-		pr_err("device creation failed with %s\n", strerror(-ret));
+		pr_err("devfs entry creation failed: %s\n", strerror(-ret));
 		return ret;
 	}
 
@@ -388,6 +388,8 @@
 	struct device_d *dev = &cdev->class_dev;
 	int status;
 
+	devfs_remove(&cdev->devfs);
+
 	list_del(&cdev->list);
 	if (list_empty(&console_list))
 		initialized = CONSOLE_UNINITIALIZED;