diff --git a/changes.txt b/changes.txt
index 2578b042..a897fa90 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,8 @@
 Changes in 1.6
+ - Fixed a bug in the edit box where events are sometimes sent to a null parent, reported by Sudi
+
  - Added generic console device. You can now use Irrlicht to create and manipuate graphics on a shell where no graphics hardware 
-   or windowing system is available. To enable it uncomment #define _IRR_USE_CONSOLE_DEVICE_ in IrrCompileConfig.h
+   or windowing system is available. To enable it uncomment #define _IRR_USE_CONSOLE_DEVICE_ in IrrCompileConfig.h

 
 Changes in 1.6 TA
 	- implemented isALoadableFileFormat ( File *file ) for the Archive Loader
diff --git a/source/Irrlicht/CGUIEditBox.cpp b/source/Irrlicht/CGUIEditBox.cpp
index bf206a2a..49438112 100644
--- a/source/Irrlicht/CGUIEditBox.cpp
+++ b/source/Irrlicht/CGUIEditBox.cpp
@@ -441,7 +441,8 @@ bool CGUIEditBox::processKey(const SEvent& event)
 			e.GUIEvent.Caller = this;
 			e.GUIEvent.Element = 0;
 			e.GUIEvent.EventType = EGET_EDITBOX_ENTER;
-			Parent->OnEvent(e);
+			if (Parent)
+				Parent->OnEvent(e);
 		}
 		break;
 	case KEY_LEFT: