Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision bf226890b652b5f45705176ec053f2c793b7f17e)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
@@ -35,5 +35,4 @@
 #include <string.h>
 #include <fcntl.h>
-#include <assert.h>
 #include "config.h"
 #include "util.h"
@@ -125,10 +124,17 @@
 			res -= bytes;
 		} while (res > 0);
-		assert(res == 0);
+
+		/* TODO: re-insert assert() once this is stand alone,
+		 * removed as abort() exits the entire shell
+		 */
+		if (res != 0) {
+			printf("\n%d more bytes than actually exist were copied\n", res);
+			goto err;
+		}
 	}
 
 	if (bytes < 0) {
 err:
-		printf("Error copying %s, (%d)\n", src, bytes);
+		printf("\nError copying %s, (%d)\n", src, bytes);
 		copied = bytes;
 	}
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision bf226890b652b5f45705176ec053f2c793b7f17e)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision b7be2306e00c5daf940f0576c52cc60bcff8feba)
@@ -34,5 +34,4 @@
 #include <fcntl.h>
 #include <dirent.h>
-#include <assert.h>
 #include <getopt.h>
 
@@ -220,5 +219,9 @@
 		len = strlen(argv[i]) + 2;
 		buff = (char *) realloc(buff, len);
-		assert(buff != NULL);
+		if (buff == NULL) {
+			printf("rm: out of memory\n");
+			ret = 1;
+			break;
+		}
 		memset(buff, 0, sizeof(buff));
 		snprintf(buff, len, argv[i]);