From b638b1cea21d3756ced640c17114ac63bb73b928 Mon Sep 17 00:00:00 2001
From: Robin <robin@getgreenshot.org>
Date: Tue, 24 May 2016 13:49:46 +0200
Subject: [PATCH] Another NPE fix

---
 Greenshot/Drawing/DrawableContainer.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Greenshot/Drawing/DrawableContainer.cs b/Greenshot/Drawing/DrawableContainer.cs
index b1bdecbec..650e20992 100644
--- a/Greenshot/Drawing/DrawableContainer.cs
+++ b/Greenshot/Drawing/DrawableContainer.cs
@@ -89,9 +89,14 @@ namespace Greenshot.Drawing
 			if (!disposing) {
 				return;
 			}
-
-			FieldAggregator aggProps = _parent.FieldAggregator;
-			aggProps.UnbindElement(this);
+			if (_parent != null)
+			{
+				FieldAggregator fieldAggregator = _parent.FieldAggregator;
+				if (fieldAggregator != null)
+				{
+					fieldAggregator.UnbindElement(this);
+				}
+			}
 		}
 
 		~DrawableContainer() {