From 9fcc13083897d8542f5f0b64a668a027b42ce655 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 1 Feb 2017 12:13:36 +1000
Subject: [PATCH] Catch transform errors for annotations

---
 src/gui/qgsmapcanvasannotationitem.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gui/qgsmapcanvasannotationitem.cpp b/src/gui/qgsmapcanvasannotationitem.cpp
index 2e009bc771b5..529246a26317 100644
--- a/src/gui/qgsmapcanvasannotationitem.cpp
+++ b/src/gui/qgsmapcanvasannotationitem.cpp
@@ -57,7 +57,14 @@ void QgsMapCanvasAnnotationItem::updatePosition()
   if ( mAnnotation->hasFixedMapPosition() )
   {
     QgsCoordinateTransform t( mAnnotation->mapPositionCrs(), mMapCanvas->mapSettings().destinationCrs() );
-    setPos( toCanvasCoordinates( t.transform( mAnnotation->mapPosition() ) ) );
+    QgsPoint coord = mAnnotation->mapPosition();
+    try
+    {
+      coord = t.transform( coord );
+    }
+    catch ( QgsCsException& )
+      {}
+    setPos( toCanvasCoordinates( coord ) );
   }
   else
   {