diff --git a/src/Eto.Wpf/Drawing/GraphicsHandler.cs b/src/Eto.Wpf/Drawing/GraphicsHandler.cs
index 56276760de..0a2c5bbbdf 100644
--- a/src/Eto.Wpf/Drawing/GraphicsHandler.cs
+++ b/src/Eto.Wpf/Drawing/GraphicsHandler.cs
@@ -513,7 +513,7 @@ public void RestoreTransform()
 
 		public IMatrix CurrentTransform
 		{
-			get { return transforms.Current != null ? transforms.Current.Clone() : Matrix.Create(); }
+			get { return transforms?.Current?.Clone() ?? Matrix.Create(); }
 		}
 
 		void RewindOffset()