diff --git a/CONTRIBUTORS b/CONTRIBUTORS
new file mode 100644
index 0000000..d1fe4aa
--- /dev/null
+++ b/CONTRIBUTORS
@@ -0,0 +1 @@
+Piotr Chmura
diff --git a/xsanecli.py b/xsanecli.py
index 6dda419..b66fb50 100755
--- a/xsanecli.py
+++ b/xsanecli.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 #   GIMP 3.0 plug-in for scanning via XSane
-#   Copyright (C) 2024-2025  Lee Yingtong Li (RunasSudo)
+#   Copyright (C) 2024-2025  Lee Yingtong Li (RunasSudo) and CONTRIBUTORS
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -52,29 +52,24 @@ def xsanecli_run(procedure, config, run_data, *args):
 	args = ['xsane', '--save', '--no-mode-selection', '--force-filename', png_out, '--print-filenames'] + ([DEVICE_NAME] if DEVICE_NAME else [])
 	proc = subprocess.Popen(args, stdout=subprocess.PIPE, encoding='utf-8', env=xsane_env)
 	
-	while True:
+	while proc.poll() is None:
 		# Wait until XSane prints the name of the scanned file, indicating scanning is finished
 		# This blocks Python but that is ok because GIMP UI is not affected
-		result = proc.stdout.readline().strip()
+		try:
+			result = proc.stdout.readline().strip()
+		except UnicodeDecodeError as e:
+			result = ''
 		
-		if result == '':
-			# XSane was closed
-			break
-		
-		if result != 'XSANE_IMAGE_FILENAME: ' + png_out:
-			Gimp.message('Unexpected XSane result')
-			return Gimp.ValueArray.new_from_values([GObject.Value(Gimp.PDBStatusType, Gimp.PDBStatusType.EXECUTION_ERROR)])
-		
-		# Open image
-		image = Gimp.file_load(Gimp.RunMode.NONINTERACTIVE, Gio.File.new_for_path(png_out))
-		Gimp.Display.new(image)
-		
-		# Remove temporary files
-		os.unlink(png_out)
-		
-		if not SCAN_MULTIPLE:
-			proc.terminate()
-			break
+		if result == 'XSANE_IMAGE_FILENAME: ' + png_out:
+			# Open image
+			image = Gimp.file_load(Gimp.RunMode.NONINTERACTIVE, Gio.File.new_for_path(png_out))
+			Gimp.Display.new(image)
+			
+			# Remove temporary files
+			os.unlink(png_out)
+			
+			if not SCAN_MULTIPLE:
+				proc.terminate()
 	
 	os.rmdir(tempdir)