diff --git a/include/aare/Hdf5File.hpp b/include/aare/Hdf5File.hpp
index 3c011c9..5c0fbd2 100644
--- a/include/aare/Hdf5File.hpp
+++ b/include/aare/Hdf5File.hpp
@@ -29,7 +29,7 @@ struct H5Handles {
     datatype(dataset.getDataType())
   {
     if (dataspace.getSimpleExtentNdims() != rank) {
-      throw std::runtime_error(LOCATION + "Expected rank of " + dname + " dataset to be 1. Got " + std::to_string(rank));
+      throw std::runtime_error(LOCATION + "Expected rank of " + dname + " dataset to be " + std::to_string(rank) + ". Got " + std::to_string(dataspace.getSimpleExtentNdims()));
     }
     dims.resize(rank);
     dataspace.getSimpleExtentDims(dims.data(), nullptr);
diff --git a/src/Hdf5File.cpp b/src/Hdf5File.cpp
index 251b65a..635ab02 100644
--- a/src/Hdf5File.cpp
+++ b/src/Hdf5File.cpp
@@ -18,7 +18,7 @@ Hdf5File::Hdf5File(const std::filesystem::path &fname, const std::string &mode)
     }
 }
 
-Frame Hdf5File::read_frame() { return get_frame(m_current_frame++); };
+Frame Hdf5File::read_frame() { return get_frame(m_current_frame++); }
 
 Frame Hdf5File::read_frame(size_t frame_number) {
     seek(frame_number);
@@ -36,12 +36,12 @@ void Hdf5File::read_into(std::byte *image_buf, size_t n_frames) {
 
 void Hdf5File::read_into(std::byte *image_buf) {
     return get_frame_into(m_current_frame++, image_buf);
-};
+}
 
 void Hdf5File::read_into(std::byte *image_buf, DetectorHeader *header) {
 
     return get_frame_into(m_current_frame++, image_buf, header);
-};
+}
 
 void Hdf5File::read_into(std::byte *image_buf, size_t n_frames,
                          DetectorHeader *header) {
@@ -53,7 +53,7 @@ void Hdf5File::read_into(std::byte *image_buf, size_t n_frames,
         if (header)
             header += n_mod();
     }
-};
+}
 
 size_t Hdf5File::n_mod() const { return 1; }
 
@@ -72,9 +72,9 @@ void Hdf5File::seek(size_t frame_index) {
         m_header_files[i]->seek(frame_index);
     }
     m_current_frame = frame_index;
-};
+}
 
-size_t Hdf5File::tell() { return m_current_frame; };
+size_t Hdf5File::tell() { return m_current_frame; }
 
 size_t Hdf5File::total_frames() const { return m_total_frames; }
 size_t Hdf5File::rows() const { return m_rows; }
diff --git a/src/NumpyFile.cpp b/src/NumpyFile.cpp
index 109439a..ea58a9a 100644
--- a/src/NumpyFile.cpp
+++ b/src/NumpyFile.cpp
@@ -72,8 +72,8 @@ void NumpyFile::get_frame_into(size_t frame_number, std::byte *image_buf) {
     }
 }
 
-size_t NumpyFile::pixels_per_frame() { return m_pixels_per_frame; };
-size_t NumpyFile::bytes_per_frame() { return m_bytes_per_frame; };
+size_t NumpyFile::pixels_per_frame() { return m_pixels_per_frame; }
+size_t NumpyFile::bytes_per_frame() { return m_bytes_per_frame; }
 
 std::vector<Frame> NumpyFile::read_n(size_t n_frames) {
     // TODO: implement this in a more efficient way
diff --git a/src/RawFile.cpp b/src/RawFile.cpp
index 744064f..bf3b6df 100644
--- a/src/RawFile.cpp
+++ b/src/RawFile.cpp
@@ -30,7 +30,7 @@ RawFile::RawFile(const std::filesystem::path &fname, const std::string &mode)
     }
 }
 
-Frame RawFile::read_frame() { return get_frame(m_current_frame++); };
+Frame RawFile::read_frame() { return get_frame(m_current_frame++); }
 
 Frame RawFile::read_frame(size_t frame_number) {
     seek(frame_number);
@@ -48,13 +48,13 @@ void RawFile::read_into(std::byte *image_buf, size_t n_frames) {
 
 void RawFile::read_into(std::byte *image_buf) {
     return get_frame_into(m_current_frame++, image_buf);
-};
+}
 
 
 void RawFile::read_into(std::byte *image_buf, DetectorHeader *header) {
 
     return get_frame_into(m_current_frame++, image_buf, header);
-};
+}
 
 void RawFile::read_into(std::byte *image_buf, size_t n_frames, DetectorHeader *header) {
     // return get_frame_into(m_current_frame++, image_buf, header);
@@ -66,7 +66,7 @@ void RawFile::read_into(std::byte *image_buf, size_t n_frames, DetectorHeader *h
             header+=n_mod();
     }
 
-};
+}
 
 size_t RawFile::n_mod() const { return n_subfile_parts; }
 
@@ -87,9 +87,9 @@ void RawFile::seek(size_t frame_index) {
                         frame_index, total_frames()));
     }
     m_current_frame = frame_index;
-};
+}
 
-size_t RawFile::tell() { return m_current_frame; };
+size_t RawFile::tell() { return m_current_frame; }
 
 size_t RawFile::total_frames() const { return m_master.frames_in_file(); }
 size_t RawFile::rows() const { return m_rows; }
diff --git a/src/RawMasterFile.cpp b/src/RawMasterFile.cpp
index 052bb00..30d93a4 100644
--- a/src/RawMasterFile.cpp
+++ b/src/RawMasterFile.cpp
@@ -87,7 +87,7 @@ int ScanParameters::start() const { return m_start; }
 int ScanParameters::stop() const { return m_stop; }
 void ScanParameters::increment_stop(){
     m_stop += 1;
-};
+}
 int ScanParameters::step() const { return m_step; }
 const std::string &ScanParameters::dac() const { return m_dac; }
 bool ScanParameters::enabled() const { return m_enabled; }