diff --git a/source3/client/client.c b/source3/client/client.c
index 9de5b12..0157a73 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -531,7 +531,7 @@ static NTSTATUS display_finfo(struct cli_state *cli_state, struct file_info *fin
 
 	t = finfo->mtime_ts.tv_sec; /* the time is assumed to be passed as GMT */
 	if (!showacls) {
-		d_printf("  %-30s%7.7s %8.0f  %s",
+		d_printf("%s\t%s\t%8.0f\t%s",
 			 finfo->name,
 			 attrib_string(finfo->mode),
 		 	(double)finfo->size,
@@ -1532,7 +1532,9 @@ static int cmd_mkdir(void)
 				return 1;
 			}
 			if (!NT_STATUS_IS_OK(cli_chkpath(targetcli, ddir2))) {
-				do_mkdir(ddir2);
+				if(!do_mkdir(ddir2)){
+					return 1;
+				}
 			}
 			ddir2 = talloc_asprintf_append(ddir2, "%s", CLI_DIRSEP_STR);
 			if (!ddir2) {
@@ -1541,7 +1543,9 @@ static int cmd_mkdir(void)
 			p = strtok_r(NULL, "/\\", &saveptr);
 		}
 	} else {
-		do_mkdir(mask);
+		if(!do_mkdir(mask)){
+			return 1;
+		}
 	}
 
 	return 0;
@@ -2773,6 +2777,7 @@ static int cmd_rmdir(void)
 	if (!NT_STATUS_IS_OK(cli_rmdir(targetcli, targetname))) {
 		d_printf("%s removing remote directory file %s\n",
 			 cli_errstr(targetcli),mask);
+		return 1;
 	}
 
 	return 0;