diff --git a/src/engraving/libmscore/beam.cpp b/src/engraving/libmscore/beam.cpp
index b3ec78f582..f61b413fc6 100644
--- a/src/engraving/libmscore/beam.cpp
+++ b/src/engraving/libmscore/beam.cpp
@@ -1000,8 +1000,14 @@ void Beam::layout2(std::vector<ChordRest*> chordRests, SpannerSegmentType, int f
         // fix horizontal spacing of stems
         LayoutBeams::respace(&chordRests);
     }
-    Chord* startChord = toChord(chordRests[0]);
-    Chord* endChord = toChord(chordRests[chordRests.size() - 1]);
+
+    // FIXME
+    if (!chordRests.front()->isChord() || !chordRests.back()->isChord()) {
+        NOT_IMPL_RETURN;
+    }
+
+    Chord* startChord = toChord(chordRests.front());
+    Chord* endChord = toChord(chordRests.back());
 
     // anchor represents the middle of the beam, not the tip of the stem
     PointF startAnchor = chordBeamAnchor(startChord);
diff --git a/thirdparty/haw_logger/logger/log_base.h b/thirdparty/haw_logger/logger/log_base.h
index 61de05f4f0..6eb0f5a966 100644
--- a/thirdparty/haw_logger/logger/log_base.h
+++ b/thirdparty/haw_logger/logger/log_base.h
@@ -42,7 +42,7 @@
 #define DEPRECATED LOGD() << "This function deprecated!!"
 #define DEPRECATED_USE(use) LOGD() << "This function deprecated!! Use:" << use
 #define NOT_IMPLEMENTED LOGW() << "Not implemented!!"
-#define NOT_IMPL_RETURN NOT_IMPLEMENTED return
+#define NOT_IMPL_RETURN NOT_IMPLEMENTED; return
 #define NOT_SUPPORTED LOGW() << "Not supported!!"
 #define NOT_SUPPORTED_USE(use) LOGW() << "Not supported!! Use:" << use