diff --git a/license.txt b/license.txt
index c6815b40c4c9e7236d5f86f665f156046e0358e6..cb4ee4197b16f90511902fe5d5744354bc7a1037 100644
--- a/license.txt
+++ b/license.txt
@@ -29,7 +29,7 @@ License: GPL-3+
  along with the Dynare GUI.  If not, see <http://www.gnu.org/licenses/>.
 
 Files: src/+gui_external/*
-Copyright: 2007-2016 Yair Altman
+Copyright: 2007-2017 Yair Altman
 License:
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
diff --git a/src/+gui_external/findjobj.m b/src/+gui_external/findjobj.m
index bdec64b01936b84fb22fa09e8936bcd57760fa6c..95a29461390b04bd9dfb347b695bed00ae1db348 100644
--- a/src/+gui_external/findjobj.m
+++ b/src/+gui_external/findjobj.m
@@ -88,6 +88,7 @@ function [handles,levels,parentIdx,listing] = findjobj(container,varargin) %#ok<
 %    Please send to Yair Altman (altmany at gmail dot com)
 %
 % Change log:
+%    2017-04-13: Fixed two edge-cases (one suggested by H. Koch)
 %    2016-04-19: Fixed edge-cases in old Matlab release; slightly improved performance even further
 %    2016-04-14: Improved performance for the most common use-case (single input/output): improved code + allow inspecting groot
 %    2016-04-11: Improved performance for the most common use-case (single input/output)
@@ -144,7 +145,7 @@ function [handles,levels,parentIdx,listing] = findjobj(container,varargin) %#ok<
 % referenced and attributed as such. The original author maintains the right to be solely associated with this work.
 
 % Programmed and Copyright by Yair M. Altman: altmany(at)gmail.com
-% $Revision: 1.49 $  $Date: 2016/04/18 23:44:49 $
+% $Revision: 1.50 $  $Date: 2017/04/13 20:47:08 $
 
     % Ensure Java AWT is enabled
     error(javachk('awt'));
@@ -3377,7 +3378,13 @@ function jControl = findjobj_fast(hControl, jContainer)
     oldWarn = warning('off','MATLAB:HandleGraphics:ObsoletedProperty:JavaFrame');
     if nargin < 2 || isempty(jContainer)
         % Use a HG2 matlab.ui.container.Panel jContainer if the control's parent is a uipanel
-        hParent = get(hControl,'Parent');
+        try
+            hParent = get(hControl,'Parent');
+        catch
+            % Probably indicates an invalid/deleted/empty handle
+            jControl = [];
+            return
+        end
         try jContainer = hParent.JavaFrame.getGUIDEView; catch, jContainer = []; end
     end
     if isempty(jContainer)
@@ -3401,6 +3408,7 @@ function jControl = findjobj_fast(hControl, jContainer)
 end
 function jControl = findTooltipIn(jContainer)
     try
+        jControl = [];  % Fix suggested by H. Koch 11/4/2017
         tooltipStr = jContainer.getToolTipText;
         %if strcmp(char(tooltipStr),'!@#$%^&*')
         if ~isempty(tooltipStr) && tooltipStr.startsWith('!@#$%^&*')  % a bit faster
@@ -3413,7 +3421,6 @@ function jControl = findTooltipIn(jContainer)
         end
     catch
         % ignore
-        jControl = [];
     end
 end