diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp
index d2141f88b..7cda666b9 100644
--- a/src/core/track_container.cpp
+++ b/src/core/track_container.cpp
@@ -248,7 +248,10 @@ void trackContainer::removeTrack( track * _track )
 		eng()->getMixer()->play();
 
 		realignTracks();
-		eng()->getSongEditor()->setModified();
+		if( eng()->getSongEditor() )
+		{
+			eng()->getSongEditor()->setModified();
+		}
 	}
 }
 
diff --git a/src/lib/journalling_object.cpp b/src/lib/journalling_object.cpp
index 37944bd60..116d4b12c 100644
--- a/src/lib/journalling_object.cpp
+++ b/src/lib/journalling_object.cpp
@@ -58,7 +58,7 @@ journallingObject::journallingObject( engine * _engine ) :
 
 journallingObject::~journallingObject()
 {
-	if( eng() != NULL )
+	if( eng() && eng()->getProjectJournal() )
 	{
 		eng()->getProjectJournal()->freeID( id() );
 	}