diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 96d972470bbd6ed972ae5d30547fd2ba7218ce9a..3733c57815f442dec3fdfe3346a3326645c61314 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -441,10 +441,20 @@ function install_web_admin {
         mkdir -p "/var/www/${local_hostname}/htdocs/admin"
     fi
 
+    web_admin_installed=
     if [ -d "/usr/share/${PROJECT_NAME}/webadmin" ]; then
-        cp -r "/usr/share/${PROJECT_NAME}/webadmin"/* "/var/www/${local_hostname}/htdocs/admin"
-        cp "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}"/*.html "/var/www/${local_hostname}/htdocs/admin"
+        if [ -d "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}" ]; then
+            cp -r "/usr/share/${PROJECT_NAME}/webadmin"/* "/var/www/${local_hostname}/htdocs/admin"
+            cp "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}"/*.html "/var/www/${local_hostname}/htdocs/admin"
+            web_admin_installed=1
+        else
+            echo $"No web admin language subdirectory for ${language_subdir}"
+        fi
     else
+        echo $"Directory not found /usr/share/${PROJECT_NAME}/webadmin"
+    fi
+
+    if [ ! $web_admin_installed ]; then
         placeholderstr=$"This is a placeholder for the web admin panel on ${local_hostname}"
         { echo '<html>';
           echo '  <body>';