diff --git a/samba/lang/en b/samba/lang/en
index fd811f460..4d7ce6473 100644
--- a/samba/lang/en
+++ b/samba/lang/en
@@ -365,6 +365,7 @@ savefshare_global=The name 'global' cannot be used for a share
 savefshare_owner=Missing or invalid owner for new directory
 savefshare_group=Missing or invalid group for new directory
 savefshare_perms=Missing or invalid permissions for new directory
+savefshare_emkdir=Failed to create directory : $1
 
 savemisc_fail=Failed to save options
 savemisc_lockdir=The directory containing the lock directory does not exist
diff --git a/samba/save_fshare.cgi b/samba/save_fshare.cgi
index 77dbd9f90..9fd33dba7 100755
--- a/samba/save_fshare.cgi
+++ b/samba/save_fshare.cgi
@@ -89,7 +89,8 @@ else {
 	# Creating a new share
 	&create_share($name);
 	if ($in{'create'} eq "yes" && !-d $in{'path'}) {
-		&make_dir($in{'path'}, oct($in{'createperms'}));
+		&make_dir($in{'path'}, oct($in{'createperms'})) ||
+			&error(&text('savefshare_emkdir', $!));
 		&set_ownership_permissions($in{'createowner'},
 					   $in{'creategroup'},
 					   oct($in{'createperms'}),