diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/quality/loghistogram.h b/CEP/DP3/AOFlagger/include/AOFlagger/quality/loghistogram.h
index 4bc42f9a72debfb1cc673d2c4225c5840b49dd33..c1cbb54dd49576901fec0a27890526cf26ebbf58 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/quality/loghistogram.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/quality/loghistogram.h
@@ -109,7 +109,7 @@ class LogHistogram
 		double MaxAmplitude() const
 		{
 			if(_amplitudes.empty())
-				throw std::runtime_error("Empty histogram");
+				return 0.0;
 			return _amplitudes.rbegin()->first;
 		}
 		
@@ -117,12 +117,12 @@ class LogHistogram
 		{
 			std::map<double, AmplitudeBin>::const_iterator i = _amplitudes.begin();
 			if(i == _amplitudes.end())
-				throw std::runtime_error("Empty histogram");
+				return 0.0;
 			while(i->first <= 0.0)
 			{
 				++i;
 				if(i == _amplitudes.end())
-					throw std::runtime_error("Histogram does not contain positive values");
+					return 0.0;
 			}
 			return i->first;
 		}
diff --git a/CEP/DP3/AOFlagger/src/aoquality.cpp b/CEP/DP3/AOFlagger/src/aoquality.cpp
index d31c6d2c5a3ff326715d96620fecb792e9b3817b..bbbcc30d7462d54c6574d7a7e2e286d3dc04b139 100644
--- a/CEP/DP3/AOFlagger/src/aoquality.cpp
+++ b/CEP/DP3/AOFlagger/src/aoquality.cpp
@@ -35,6 +35,12 @@
 #include <AOFlagger/remote/processcommander.h>
 #include <AOFlagger/util/plot.h>
 
+#include <AOFlagger/configuration.h>
+
+#ifdef HAS_LOFARSTMAN
+#include <LofarStMan/Register.h>
+#endif // HAS_LOFARSTMAN                                                       
+
 void reportProgress(unsigned step, unsigned totalSteps)
 {
 	const unsigned twoPercent = (totalSteps+49)/50;
@@ -219,7 +225,7 @@ void actionCollect(const std::string &filename, enum CollectingMode mode)
 					plotSlopes.SetLogScale(true, false);
 					plotHistograms.StartLine();
 					plotHistograms.SetLogScale(true, true);
-					while(rangeCentre < maxAmplitude)
+					while(rangeCentre < maxAmplitude && rangeCentre > 0.0)
 					{
 						const double rangeStart = rangeCentre * 0.75;
 						const double rangeEnd = rangeCentre * 1.5;
@@ -482,6 +488,10 @@ void printSyntax(std::ostream &stream, char *argv[])
 
 int main(int argc, char *argv[])
 {
+#ifdef HAS_LOFARSTMAN
+	register_lofarstman();
+#endif // HAS_LOFARSTMAN
+
 	if(argc < 2)
 	{
 		printSyntax(std::cerr, argv);
diff --git a/CEP/DP3/AOFlagger/src/gui/quality/timefrequencyplotpage.cpp b/CEP/DP3/AOFlagger/src/gui/quality/timefrequencyplotpage.cpp
index b8ef6eabd587dd848ed52452f964090d46804ea0..41d84c001d4f7bacf88bf878b178e8f88afac282 100644
--- a/CEP/DP3/AOFlagger/src/gui/quality/timefrequencyplotpage.cpp
+++ b/CEP/DP3/AOFlagger/src/gui/quality/timefrequencyplotpage.cpp
@@ -67,6 +67,6 @@ void TimeFrequencyPlotPage::onMouseMoved(size_t x, size_t y)
 	const QualityTablesFormatter::StatisticKind kind = GetSelectedStatisticKind();
 	const std::string &kindName = QualityTablesFormatter::KindToName(kind);
 	
-	text << kindName << " = " << GrayScaleWidget().Image()->Value(x, y);
+	text << kindName << " = " << GrayScaleWidget().Image()->Value(x, y) << " (" << x << ", " << y << ")";
 	_signalStatusChange(text.str());
 }