diff --git a/media_server/routes/browser.py b/media_server/routes/browser.py
index 0625bee..c3cedcb 100644
--- a/media_server/routes/browser.py
+++ b/media_server/routes/browser.py
@@ -113,6 +113,8 @@ async def create_folder(
             "message": f"Media folder '{request.folder_id}' created successfully",
         }
 
+    except HTTPException:
+        raise
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
     except Exception as e:
@@ -161,6 +163,8 @@ async def update_folder(
             "message": f"Media folder '{folder_id}' updated successfully",
         }
 
+    except HTTPException:
+        raise
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
     except Exception as e:
diff --git a/scripts/install_task_windows.ps1 b/scripts/install_task_windows.ps1
index 7f67f34..4d9b7d1 100644
--- a/scripts/install_task_windows.ps1
+++ b/scripts/install_task_windows.ps1
@@ -1,7 +1,7 @@
 Unregister-ScheduledTask -TaskName "MediaServer" -Confirm:$false -ErrorAction SilentlyContinue
 
-# Get the project root directory (two levels up from this script)
-$projectRoot = (Get-Item $PSScriptRoot).Parent.Parent.FullName
+# Get the media-server directory (parent of scripts folder)
+$serverRoot = (Get-Item $PSScriptRoot).Parent.FullName
 
 # Find Python executable
 $pythonPath = (Get-Command python -ErrorAction SilentlyContinue).Source
@@ -10,10 +10,10 @@ if (-not $pythonPath) {
     exit 1
 }
 
-$action = New-ScheduledTaskAction -Execute $pythonPath -Argument "-m media_server.main" -WorkingDirectory $projectRoot
+$action = New-ScheduledTaskAction -Execute $pythonPath -Argument "-m media_server.main" -WorkingDirectory $serverRoot
 $trigger = New-ScheduledTaskTrigger -AtStartup
 $principal = New-ScheduledTaskPrincipal -UserId "$env:USERNAME" -LogonType S4U -RunLevel Highest
 $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable
 Register-ScheduledTask -TaskName "MediaServer" -Action $action -Trigger $trigger -Principal $principal -Settings $settings -Description "Media Server for Home Assistant"
 
-Write-Host "Scheduled task 'MediaServer' created with working directory: $projectRoot"
+Write-Host "Scheduled task 'MediaServer' created with working directory: $serverRoot"