diff --git a/CHANGELOG.md b/CHANGELOG.md
index 371174a..0425753 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.4] - 2024-04-07
+### Changed
+- Improved handling an empty 'measurement.yaml' file
+
 ## [0.8.3] - 2024-04-06
 ### Added
 - Added a check to prevent 'NoneType' is not iterable errors
diff --git a/config.yaml b/config.yaml
index b1b069c..7b08328 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,6 +1,6 @@
 name: "S0PCM Reader"
 description: "S0PCM reader based on docker-s0pcm-reader"
-version: "0.8.3"
+version: "0.8.4"
 slug: "s0pcm_reader"
 url: "https://github.com/darkrain-nl/home-assistant-addon-s0pcm-reader"
 codenotary: jan@darkrain.nl
diff --git a/rootfs/usr/src/s0pcm-reader.py b/rootfs/usr/src/s0pcm-reader.py
index 5f6b2b5..874dc8d 100644
--- a/rootfs/usr/src/s0pcm-reader.py
+++ b/rootfs/usr/src/s0pcm-reader.py
@@ -91,7 +91,7 @@
 config = {}
 measurement = {}
 measurementshare = {}
-s0pcmreaderversion = '2024.04.06'
+s0pcmreaderversion = '2024.04.07'
 
 # ------------------------------------------------------------------------------------
 # Parameters
@@ -247,7 +247,7 @@ def ReadMeasurement():
     except FileNotFoundError:
         logger.warning('No \'%s\' found, using defaults.', measurementname)
 
-    # check if measurement['date'] is None
+    # check if measurement is None
     if measurement is not None:
         # check date format
         if 'date' in measurement:
@@ -263,7 +263,8 @@ def ReadMeasurement():
 
         logger.debug('Measurement: %s', str(measurement))
     else:
-        logger.error('measurement is None %s', str(measurement))
+        logger.error('\'%s\' is empty: \'%s\' fix this by removing the file or restoring a backup if you have one...', measurementname, str(measurement))
+        raise SystemExit('Cannot continue, the error above needs to be fixed first')
 
 # ------------------------------------------------------------------------------------
 # Task to read the serial port. We continue to try to open the serialport, because