1 files changed, 14 insertions, 2 deletions
diff --git a/exit.go b/exit.go
index c2f33cb..836032c 100644
--- a/exit.go
+++ b/exit.go
@@ -29,7 +29,13 @@ func (pb *Argv) GoodExit(msg string) {
 		me.appExit()
 	}
 	dur := time.Since(pb.Ctime.AsTime())
-	log.Infof("%s: %s (%s)\n", pb.Argname, msg, cobol.FormatDuration(dur))
+	var appname string
+	if pb.AppInfo == nil {
+		appname = os.Args[0]
+	} else {
+		appname = pb.AppInfo.APPNAME
+	}
+	log.Infof("%s: %s (%s)\n", appname, msg, cobol.FormatDuration(dur))
 	os.Exit(0)
 }
 
@@ -53,7 +59,13 @@ func (pb *Argv) BadExit(msg string, err error) {
 	}
 
 	dur := time.Since(pb.Ctime.AsTime())
-	log.Infof("%s error: %s (%s)\n", pb.Argname, msg, cobol.FormatDuration(dur))
+	var appname string
+	if pb.AppInfo == nil {
+		appname = os.Args[0]
+	} else {
+		appname = pb.AppInfo.APPNAME
+	}
+	log.Infof("%s error: %s (%s)\n", appname, msg, cobol.FormatDuration(dur))
 	os.Exit(1)
 }