diff --git a/main.go b/main.go
index 867391175c769a1797b8e36993cb855d52a92412..a632551b019f90f9cb586d68a8a7a2cfeeb38bfe 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"log"
 	"smoothie/tui"
 
 	tea "github.com/charmbracelet/bubbletea"
@@ -16,15 +17,15 @@ func main() {
 	var cfg Config
 	err := babyenv.Parse(&cfg)
 	if err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 	btm := BubbleTeaMiddleware(tui.SessionHandler, tea.WithAltScreen())
 	s, err := NewServer(cfg.Port, cfg.KeyPath, LoggingMiddleware(), btm)
 	if err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 	err = s.Start()
 	if err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 }
diff --git a/server.go b/server.go
index 2f53283c5334176fde1bcd90d798c05a86598782..857dfa24dfe9f793b6eb3fac3c5d2b3b3402981b 100644
--- a/server.go
+++ b/server.go
@@ -85,5 +85,6 @@ func (srv *Server) passHandler(ctx ssh.Context, pass string) bool {
 }
 
 func (srv *Server) Start() error {
+	log.Printf("Starting SSH server on %s\n", srv.server.Addr)
 	return srv.server.ListenAndServe()
 }