diff --git a/aconvert2/src/aconvert.cpp b/aconvert2/src/aconvert.cpp
index 068d2dc316078afd2c8975fcc6871646219de0f5..c4e0a286e6be4cb508dcbc3a7d9f750d25d73ef4 100644
--- a/aconvert2/src/aconvert.cpp
+++ b/aconvert2/src/aconvert.cpp
@@ -244,6 +244,8 @@ int main ( int argc, char * argv[] ) {
 			treeFromString ( * in, std::cout );
 		else if ( tree_to_string.getValue ( ) )
 			treeToString ( * in, std::cout );
+		else
+			throw exception::CommonException("Invalid format specified");
 
 		if ( input.isSet ( ) && ( input.getValue ( ) != "-" ) )
 			delete in;
diff --git a/araw2/src/araw.cpp b/araw2/src/araw.cpp
index 3d43f2f578f081fceef3a638ee2ca0137cae52af..ac9900a2c4d2e30487ae7ee94dbfee21eb55afa5 100644
--- a/araw2/src/araw.cpp
+++ b/araw2/src/araw.cpp
@@ -112,7 +112,7 @@ int main(int argc, char** argv) {
 
 			string::StringToRawComposer::compose(std::cout, string);
 		} else {
-			throw exception::CommonException("Invalid input format specified");
+			throw exception::CommonException("Invalid format specified");
 		}
 
 		measurements::end();