diff --git a/src/main/kotlin/app/git/TabState.kt b/src/main/kotlin/app/git/TabState.kt
index 69a070a..0d302ac 100644
--- a/src/main/kotlin/app/git/TabState.kt
+++ b/src/main/kotlin/app/git/TabState.kt
@@ -75,7 +75,7 @@ class TabState @Inject constructor(
                     ex.printStackTrace()
 
                     if (showError)
-                        errorsManager.addError(newErrorNow(ex, ex.localizedMessage))
+                        errorsManager.addError(newErrorNow(ex, ex.message.orEmpty()))
                 } finally {
                     _processing.value = false
 
diff --git a/src/main/kotlin/app/git/graph/GraphCommitList.kt b/src/main/kotlin/app/git/graph/GraphCommitList.kt
index f29b89e..28233fe 100644
--- a/src/main/kotlin/app/git/graph/GraphCommitList.kt
+++ b/src/main/kotlin/app/git/graph/GraphCommitList.kt
@@ -351,6 +351,8 @@ class GraphCommitList : RevCommitList<GraphNode>() {
     }
 
     fun calcMaxLine() {
-        maxLine = this.maxOf { it.lane.position }
+        if(this.isNotEmpty()) {
+            maxLine = this.maxOf { it.lane.position }
+        }
     }
 }
\ No newline at end of file