diff --git a/common/CRC.cpp b/common/CRC.cpp
index 98eba6d5cb9aee1fddcc2c35f59ed0e4a4ce9d4a..bae57397036ec2bff63d6bf4807911582d90377a 100644
--- a/common/CRC.cpp
+++ b/common/CRC.cpp
@@ -254,9 +254,10 @@ bool verifyCrc32cForMemoryBlockWithCrc32c(
     (start[cnt-2] << 16) |
     (start[cnt-1] << 24);
 
-  if (crccmp != crcblk)
+  if (crccmp != crcblk) {
     return false; //block CRC is incorrect
+  }
   return true;
 }
 
-} // namespace cta
\ No newline at end of file
+}  // namespace cta
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
index 279b6f9d9bd307211527cdfd3b7a798439584fad..f2880070783ccae4919c5a1ed418ebbdc99c050d 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
@@ -1307,8 +1307,8 @@ void drive::DriveGeneric::readExactBlock(void * data, size_t count, const std::s
             delete[] dataWithCrc32c;
         } else {
           delete[] dataWithCrc32c;
-          cta::exception::Exception(context+"Failed checksum verification for ST read"
-            " in DriveGeneric::readBlock");
+          throw cta::exception::Exception(context + " Failed checksum verification for ST read"
+                                                    " in DriveGeneric::readBlock.");
         }
         break;
       }