diff --git a/src/preview/PreviewView.cpp b/src/preview/PreviewView.cpp
index 238e4cc1a..4b12ea9c5 100644
--- a/src/preview/PreviewView.cpp
+++ b/src/preview/PreviewView.cpp
@@ -365,7 +365,7 @@ void PreviewView::OnMouseWheel(int x, int y, int d)
 
 void PreviewView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
 {
-	if ((key == KEY_ENTER || key == KEY_RETURN) && !addCommentBox->IsFocused())
+	if ((key == KEY_ENTER || key == KEY_RETURN) && (!addCommentBox || !addCommentBox->IsFocused()))
 		openButton->DoAction();
 }
 
diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp
index eaf4a1105..93c8db9aa 100644
--- a/src/simulation/elements/CRAY.cpp
+++ b/src/simulation/elements/CRAY.cpp
@@ -28,7 +28,7 @@ Element_CRAY::Element_CRAY()
     
     Temperature = R_TEMP+0.0f +273.15f;
     HeatConduct = 0;
-    Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp2";
+    Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp";
     
     State = ST_SOLID;
     Properties = TYPE_SOLID|PROP_LIFE_DEC;