diff --git a/cmd/boulder-ca/main.go b/cmd/boulder-ca/main.go
index 6900c01db..2f2b605cd 100644
--- a/cmd/boulder-ca/main.go
+++ b/cmd/boulder-ca/main.go
@@ -68,7 +68,8 @@ func main() {
 
 			auditlogger.Info(app.VersionString())
 
-			cmd.RunUntilSignaled(auditlogger, cas, closeChan)
+			err = cmd.RunUntilSignaled(auditlogger, cas, closeChan)
+			cmd.FailOnError(err, "Unable to run CA RPC server")
 		}
 	}
 
diff --git a/cmd/boulder-ra/main.go b/cmd/boulder-ra/main.go
index 1d2e6165f..b0c26c328 100644
--- a/cmd/boulder-ra/main.go
+++ b/cmd/boulder-ra/main.go
@@ -80,7 +80,8 @@ func main() {
 
 			auditlogger.Info(app.VersionString())
 
-			cmd.RunUntilSignaled(auditlogger, ras, closeChan)
+			err = cmd.RunUntilSignaled(auditlogger, ras, closeChan)
+			cmd.FailOnError(err, "Unable to run RA RPC server")
 		}
 
 	}
diff --git a/cmd/boulder-sa/main.go b/cmd/boulder-sa/main.go
index 4a6fe8372..653365d30 100644
--- a/cmd/boulder-sa/main.go
+++ b/cmd/boulder-sa/main.go
@@ -57,7 +57,8 @@ func main() {
 
 			auditlogger.Info(app.VersionString())
 
-			cmd.RunUntilSignaled(auditlogger, sas, closeChan)
+			err = cmd.RunUntilSignaled(auditlogger, sas, closeChan)
+			cmd.FailOnError(err, "Unable to run SA RPC server")
 		}
 	}
 
diff --git a/cmd/boulder-va/main.go b/cmd/boulder-va/main.go
index 7e33f7445..0758a0af2 100644
--- a/cmd/boulder-va/main.go
+++ b/cmd/boulder-va/main.go
@@ -64,7 +64,7 @@ func main() {
 
 			auditlogger.Info(app.VersionString())
 			err = cmd.RunUntilSignaled(auditlogger, vas, closeChan)
-			cmd.FailOnError(err, "Unable to run VA server")
+			cmd.FailOnError(err, "Unable to run SA RPC server")
 		}
 	}