diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 45ce8af58..22c6d06a2 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -261,7 +261,10 @@ class Config:
             sectdict = self.config[section]
         except KeyError:
             raise NoSectionError(section)
-        sectdict[self.optionxform(option)] = value
+        try:
+            sectdict[self.optionxform(option)] = value
+        except KeyError:
+            raise NoOptionError(option, section)
 
     def save(self):
         """Save the config file."""