diff --git a/src/gui/traceview.cpp b/src/gui/traceview.cpp
index 6c341ca..824e9e6 100644
--- a/src/gui/traceview.cpp
+++ b/src/gui/traceview.cpp
@@ -529,6 +529,8 @@ void TraceView::search(const QString &expression)
 //-------------------------------------------------------------------------------
 void TraceView::selectNextSearch()
 {
+    if (mMatchList.isEmpty())
+        return;
 
     if (mMatchIndex < mMatchList.size() - 1)
         mMatchIndex++;
@@ -536,10 +538,15 @@ void TraceView::selectNextSearch()
     QRegularExpressionMatch match = mMatchList[mMatchIndex];
     setSelection(match.capturedStart(), match.capturedLength());
 
+
+
 }
 //-------------------------------------------------------------------------------
 void TraceView::selectPreviousSearch()
 {
+    if (mMatchList.isEmpty())
+        return;
+
     if (mMatchIndex > 0)
         mMatchIndex--;
 
diff --git a/src/main.cpp b/src/main.cpp
index 708a7dc..62c3f32 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
     app.setApplicationName("CutePeaks");
     app.setOrganizationName("Labsquare");
     app.setOrganizationDomain("Labsquare.org");
-    app.setApplicationVersion("0.2.2");
+    app.setApplicationVersion("0.2.3");
 
     QString locale = QLocale::system().name().section('_', 0, 0);
     QTranslator translator;
diff --git a/src/resources/CHANGELOG b/src/resources/CHANGELOG
index b626462..d120231 100644
--- a/src/resources/CHANGELOG
+++ b/src/resources/CHANGELOG
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/)
 
 =======
+## [0.2.3] - 2018-01-30
+- [Hotfix] Fixed crash #67
+
 ## [0.2.2] - 2018-01-30
 - [Hotfix] Fixed wrong amino acid translation #66