diff --git a/src/main/kotlin/com/project/movienight/adapters/web/FilmLibraryController.kt b/src/main/kotlin/com/project/movienight/adapters/web/FilmLibraryController.kt
index 5a9f002..998a330 100644
--- a/src/main/kotlin/com/project/movienight/adapters/web/FilmLibraryController.kt
+++ b/src/main/kotlin/com/project/movienight/adapters/web/FilmLibraryController.kt
@@ -110,13 +110,11 @@ class FilmLibraryController(
                 getFilmLibraryUseCase.getLibrary(
                     GetFilmLibraryQuery(userId = userId),
                 )
-            }.getOrElse { exception ->
-                if (exception is EntityNotFoundException) {
-                    null
-                } else {
+            }.onFailure { exception ->
+                if (exception !is EntityNotFoundException) {
                     throw exception
                 }
-            }
+            }.getOrNull()
 
         val allFilms = getAllFilmsUseCase.getAll()
 
diff --git a/src/test/kotlin/com/project/movienight/adapters/web/FilmControllerSearchTest.kt b/src/test/kotlin/com/project/movienight/adapters/web/FilmControllerSearchTest.kt
index dd6bd33..033cccd 100644
--- a/src/test/kotlin/com/project/movienight/adapters/web/FilmControllerSearchTest.kt
+++ b/src/test/kotlin/com/project/movienight/adapters/web/FilmControllerSearchTest.kt
@@ -59,7 +59,7 @@ class FilmControllerSearchTest {
     }
 
     @Test
-    fun `search returns empty body when title is missing`() {
+    fun `search returns 404 when title is not found`() {
         val title = "Unknown Title"
 
         every { searchFilmByTitleUseCase.searchByTitle(title) } returns null
@@ -68,7 +68,7 @@ class FilmControllerSearchTest {
             .get("/api/films/search") {
                 param("title", title)
             }.andExpect {
-                status { isOk() }
+                status { isNotFound() }
                 content { string("") }
             }