diff --git a/src/yggdrasil/admin.go b/src/yggdrasil/admin.go
index 62803395..b42b2315 100644
--- a/src/yggdrasil/admin.go
+++ b/src/yggdrasil/admin.go
@@ -173,9 +173,10 @@ func (a *admin) init(c *Core) {
 	})
 	a.addHandler("getTunTap", []string{}, func(in admin_info) (r admin_info, e error) {
 		defer func() {
-			recover()
-			r = admin_info{"none": admin_info{}}
-			e = nil
+			if err := recover(); err != nil {
+				r = admin_info{"none": admin_info{}}
+				e = nil
+			}
 		}()
 
 		return admin_info{