diff --git a/src/stills/main.py b/src/stills/main.py
index bc4fa26..61da06c 100644
--- a/src/stills/main.py
+++ b/src/stills/main.py
@@ -37,8 +37,14 @@ def extract_metadata(image_path: Path):
 		meta = img.read_exif()
 		xmp = img.read_xmp()
 
+		make = meta.get('Exif.Image.Make', None)
 		camera = meta.get('Exif.Image.Model', None)
-		film = xmp['Xmp.dc.description']['lang="x-default"']
+		if make not in camera:
+			camera = make + ' ' + camera
+		try:
+			film = xmp['Xmp.dc.description']['lang="x-default"']
+		except Exception:
+			film = None
 
 		return camera, film
 	except Exception: