diff --git a/movie_db/views.py b/movie_db/views.py
index 602e418..536c6e5 100644
--- a/movie_db/views.py
+++ b/movie_db/views.py
@@ -9,4 +9,17 @@ def omdb_search(request):
 
     search_type = request.GET.get("type")
     omdb = OMDb()
-    return JsonResponse(omdb.search(query, {"type": search_type}), safe=False)
+
+    results = omdb.search(query, {"type": search_type})
+    if "error" in results:
+        return parse_error(results)
+
+    return JsonResponse(results, safe=False)
+
+
+def parse_error(results):
+    error_json = results["error"]
+    if "Error" in error_json and error_json["Error"] == "Movie not found!":
+        return JsonResponse({}, status=404)
+    else:
+        return JsonResponse("Error while searching for movie.", status=500)
\ No newline at end of file