diff --git a/casadm/cas_lib.c b/casadm/cas_lib.c
index 13936f8..f6a9f9e 100644
--- a/casadm/cas_lib.c
+++ b/casadm/cas_lib.c
@@ -1070,8 +1070,7 @@ int start_cache(uint16_t cache_id, unsigned int cache_init,
 			return FAILURE;
 		} else {
 			cas_printf(LOG_ERR, "Error inserting cache %d\n", cache_id);
-			if (OCF_ERR_NOT_OPEN_EXC == cmd.ext_err_code &&
-				FAILURE == check_cache_already_added(cache_device)) {
+			if (FAILURE == check_cache_already_added(cache_device)) {
 				cas_printf(LOG_ERR, "Cache device '%s' is already used as cache.\n",
 				cache_device);
 			} else {
@@ -1153,6 +1152,10 @@ int stop_cache(uint16_t cache_id, int flush)
 				"to operate normally. If you want to stop cache without fully\n"
 				"flushing dirty data, use '-n' option.\n");
 			return INTERRUPTED;
+		} else if (cmd.ext_err_code == OCF_ERR_WRITE_CACHE){
+			cas_printf(LOG_ERR, "Removed cache %d with errors\n", cache_id);
+			print_err(cmd.ext_err_code);
+			return FAILURE;
 		} else {
 			cas_printf(LOG_ERR, "Error while removing cache %d\n", cache_id);
 			print_err(cmd.ext_err_code);