diff --git a/.gitignore b/.gitignore
index 36bb5e6..29c8840 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ Temporary Items
 
 util/*/files
 util/*/files
+run.sh
diff --git a/connectors/slackapp/slackApp.go b/connectors/slackapp/slackApp.go
index 4a264ed..ad5e24f 100644
--- a/connectors/slackapp/slackApp.go
+++ b/connectors/slackapp/slackApp.go
@@ -334,6 +334,11 @@ func (s *SlackApp) populateEmojiList() {
 // I think it's horseshit that I have to do this
 func slackTStoTime(t string) time.Time {
 	ts := strings.Split(t, ".")
+	if len(ts) < 2 {
+		log.Fatal().
+			Str("ts", t).
+			Msg("Could not parse Slack timestamp")
+	}
 	sec, _ := strconv.ParseInt(ts[0], 10, 64)
 	nsec, _ := strconv.ParseInt(ts[1], 10, 64)
 	return time.Unix(sec, nsec)
diff --git a/main.go b/main.go
index 521a459..13b0168 100644
--- a/main.go
+++ b/main.go
@@ -58,8 +58,9 @@ func main() {
 		"Database file to load. (Defaults to catbase.db)")
 	flag.Parse() // parses the logging flags.
 
+	log.Logger = log.With().Caller().Stack().Logger()
 	if *prettyLog {
-		log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+		log.Logger = log.Logger.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 	}
 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
 	if *debug {