diff --git a/app/app.go b/app/app.go
index 125ba59..465e02b 100644
--- a/app/app.go
+++ b/app/app.go
@@ -323,8 +323,10 @@ func (app *application) shutdownPeer(onion string) {
 	delete(app.eventBuses, onion)
 	app.peers[onion].Shutdown()
 	delete(app.peers, onion)
-	app.engines[onion].Shutdown()
-	delete(app.engines, onion)
+	if _, ok := app.engines[onion]; ok {
+		app.engines[onion].Shutdown()
+		delete(app.engines, onion)
+	}
 	log.Debugf("shutting down plugins for %v", onion)
 	pluginsI, ok := app.plugins.Load(onion)
 	if ok {
@@ -349,7 +351,9 @@ func (app *application) Shutdown() {
 			return true
 		})
 		log.Debugf("Shutting Down Engines for  %v", id)
-		app.engines[id].Shutdown()
+		if _, ok := app.engines[id]; ok {
+			app.engines[id].Shutdown()
+		}
 		log.Debugf("Shutting Down Bus for  %v", id)
 		app.eventBuses[id].Shutdown()
 		log.Debugf("Done Shutdown for peer %v", id)