diff --git a/src/examples/decrypt.cc b/src/examples/decrypt.cc
index 530d3fa..26c7a8c 100644
--- a/src/examples/decrypt.cc
+++ b/src/examples/decrypt.cc
@@ -61,7 +61,7 @@ int main( int argc, char *argv[] )
     fprintf( stderr, "Nonce = %ld\n",
 	     (long)message.nonce.val() );
     cout << message.text;
-  } catch ( CryptoException e ) {
+  } catch ( const CryptoException &e ) {
     cerr << e.text << endl;
     exit( 1 );
   }
diff --git a/src/examples/encrypt.cc b/src/examples/encrypt.cc
index b5c349d..d7a5588 100644
--- a/src/examples/encrypt.cc
+++ b/src/examples/encrypt.cc
@@ -62,7 +62,7 @@ int main( int argc, char *argv[] )
     cerr << "Key: " << key.printable_key() << endl;
 
     cout << ciphertext;
-  } catch ( CryptoException e ) {
+  } catch ( const CryptoException &e ) {
     cerr << e.text << endl;
     exit( 1 );
   }
diff --git a/src/examples/ntester.cc b/src/examples/ntester.cc
index 25bef36..49ee097 100644
--- a/src/examples/ntester.cc
+++ b/src/examples/ntester.cc
@@ -65,7 +65,7 @@ int main( int argc, char *argv[] )
     } else {
       n = new Transport<UserStream, UserStream>( me, remote, NULL, NULL );
     }
-  } catch ( CryptoException e ) {
+  } catch ( const CryptoException &e ) {
     fprintf( stderr, "Fatal error: %s\n", e.text.c_str() );
     exit( 1 );
   }
@@ -97,7 +97,7 @@ int main( int argc, char *argv[] )
 	    last_num = n->get_remote_state_num();
 	  }
 	}
-      } catch ( CryptoException e ) {
+      } catch ( const CryptoException &e ) {
 	fprintf( stderr, "Cryptographic error: %s\n", e.text.c_str() );
       }
     }
@@ -163,10 +163,10 @@ int main( int argc, char *argv[] )
 	if ( network_ready_to_read ) {
 	  n->recv();
 	}
-      } catch ( NetworkException e ) {
+      } catch ( const NetworkException &e ) {
 	fprintf( stderr, "%s: %s\r\n", e.function.c_str(), strerror( e.the_errno ) );
 	break;
-      } catch ( CryptoException e ) {
+      } catch ( const CryptoException &e ) {
 	fprintf( stderr, "Cryptographic error: %s\n", e.text.c_str() );
       }
     }
diff --git a/src/frontend/mosh-client.cc b/src/frontend/mosh-client.cc
index 2f70dc4..e338682 100644
--- a/src/frontend/mosh-client.cc
+++ b/src/frontend/mosh-client.cc
@@ -175,10 +175,10 @@ int main( int argc, char *argv[] )
 
     try {
       client.main();
-    } catch ( Network::NetworkException e ) {
+    } catch ( const Network::NetworkException &e ) {
       fprintf( stderr, "Network exception: %s: %s\r\n",
 	       e.function.c_str(), strerror( e.the_errno ) );
-    } catch ( Crypto::CryptoException e ) {
+    } catch ( const Crypto::CryptoException &e ) {
       fprintf( stderr, "Crypto exception: %s\r\n",
 	       e.text.c_str() );
     }
diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc
index 141bbcd..05477ed 100644
--- a/src/frontend/stmclient.cc
+++ b/src/frontend/stmclient.cc
@@ -485,7 +485,7 @@ void STMClient::main( void )
       } else {
         overlays.get_notification_engine().clear_network_exception();
       }
-    } catch ( Network::NetworkException e ) {
+    } catch ( const Network::NetworkException &e ) {
       if ( !network->shutdown_in_progress() ) {
         overlays.get_notification_engine().set_network_exception( e );
       }
@@ -495,7 +495,7 @@ void STMClient::main( void )
       req.tv_nsec = 200000000; /* 0.2 sec */
       nanosleep( &req, NULL );
       freeze_timestamp();
-    } catch ( Crypto::CryptoException e ) {
+    } catch ( const Crypto::CryptoException &e ) {
       if ( e.fatal ) {
         throw;
       } else {