diff --git a/vppcfg/_version.py b/vppcfg/_version.py
index 31079f3..3c0338a 100644
--- a/vppcfg/_version.py
+++ b/vppcfg/_version.py
@@ -1,3 +1,3 @@
 """Version information for vppcfg."""
 
-__version__ = "1.1.4"
+__version__ = "1.1.5"
diff --git a/vppcfg/vppcfg.py b/vppcfg/vppcfg.py
index ee12ecc..e994aa3 100755
--- a/vppcfg/vppcfg.py
+++ b/vppcfg/vppcfg.py
@@ -241,6 +241,13 @@ def main():
     except OSError as err:
         logging.error(f"Couldn't read config from {args.config}: {err}")
         sys.exit(-1)
+    except yaml.YAMLError as err:
+        logging.error(f"Couldn't parse YAML from {args.config}: {err}")
+        sys.exit(-1)
+
+    if cfg is None:
+        logging.error(f"Config file {args.config} is empty")
+        sys.exit(-1)
 
     validator = Validator(schema=args.schema)
     if not validator.valid_config(cfg):