diff --git a/lib/imagereader/imdimagereader.cc b/lib/imagereader/imdimagereader.cc
index c940aee0..43f4dbcc 100644
--- a/lib/imagereader/imdimagereader.cc
+++ b/lib/imagereader/imdimagereader.cc
@@ -67,15 +67,31 @@ static unsigned getSectorSize(uint8_t flags)
 {
     switch (flags)
     {
-        case 0: return 128;
-        case 1: return 256;
-        case 2: return 512;
-        case 3: return 1024;
-        case 4: return 2048;
-        case 5: return 4096;
-        case 6: return 8192;
-    }
-    Error() << "not reachable";
+        case 0: 
+			return 128;
+			break;
+        case 1: 
+			return 256;
+			break;
+        case 2: 
+			return 512;
+			break;
+        case 3: 
+			return 1024;
+			break;
+        case 4: 
+			return 2048;
+			break;
+        case 5: 
+			return 4096;
+			break;
+        case 6: 
+			return 8192;
+			break;
+		default:
+	    	Error() << "not reachable";
+			throw 0;
+	}
 }
 
 
diff --git a/lib/imagewriter/imdimagewriter.cc b/lib/imagewriter/imdimagewriter.cc
index 05b965b3..6c88534f 100644
--- a/lib/imagewriter/imdimagewriter.cc
+++ b/lib/imagewriter/imdimagewriter.cc
@@ -222,9 +222,15 @@ public:
 				{
 					switch (dataRate)
 					{
-					case ImdOutputProto::RATE_HD : RATE = 1000;
-					case ImdOutputProto::RATE_SD : RATE = 1500;
-					case ImdOutputProto::RATE_DD : RATE = 2000;
+					case ImdOutputProto::RATE_HD : 
+						RATE = 1000;
+						break;
+					case ImdOutputProto::RATE_SD : 
+						RATE = 1500;
+						break;
+					case ImdOutputProto::RATE_DD : 
+						RATE = 2000;
+						break;
 					}
 				}
 					header.ModeValue = getModulationandSpeed(RATE, recordingMode);