diff --git a/src/EnergyCalTool.cpp b/src/EnergyCalTool.cpp
index 3d1445f5..c9dd0691 100644
--- a/src/EnergyCalTool.cpp
+++ b/src/EnergyCalTool.cpp
@@ -137,6 +137,9 @@ namespace
     assert( specfile );
     InterSpec * const viewer = InterSpec::instance();
     assert( viewer );
+    if( !viewer )
+      return;
+
     const shared_ptr<SpecMeas> specfile_now = viewer ? viewer->measurment( type ) : nullptr;
     assert( specfile == specfile_now );
     if( !specfile || (specfile != specfile_now) )
diff --git a/src/PeakInfoDisplay.cpp b/src/PeakInfoDisplay.cpp
index 77015efe..2fe080bd 100644
--- a/src/PeakInfoDisplay.cpp
+++ b/src/PeakInfoDisplay.cpp
@@ -568,8 +568,6 @@ void PeakInfoDisplay::createNewPeak()
     auto closer = wApp->bind( boost::bind( &AuxWindow::deleteAuxWindow, window ) );
     undoManager->addUndoRedoStep( closer, nullptr , "Open add peak dialog." );
   }//if( undoManager )
-  
-  return window;
 }//createNewPeak()