diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index a520ccc84c4..05412d88862 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -1977,7 +1977,7 @@ static void object_panel_particles(Object *ob)
 	
 	uiDefBut(block, LABEL, 0, "Emit:",					0,150,75,20, NULL, 0.0, 0, 0, 0, "");
 	uiBlockBeginAlign(block);
-	uiDefButI(block, NUM, B_CALCEFFECT, "Num:",			0,130,150,20, &paf->totpart, 1.0, 100000.0, 0, 0, "The total number of particles");
+	uiDefButI(block, NUM, B_CALCEFFECT, "Amount:",			0,130,150,20, &paf->totpart, 1.0, 100000.0, 0, 0, "The total number of particles");
 	if(paf->flag & PAF_STATIC) {
 		uiDefButS(block, NUM, REDRAWVIEW3D, "Step:",	0,110,150,20, &paf->staticstep, 1.0, 100.0, 10, 0, "For static duplicators, the Step value skips particles");
 	}
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index c12d1c6962f..4d17416c8d4 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -1459,7 +1459,7 @@ void sound_panels()
 
 	/* paranoia check */
 	sound = G.buts->lockpoin;
-	if( GS(sound->id.name)!=ID_SO) {
+	if(sound && GS(sound->id.name)!=ID_SO) {
 		sound= NULL;
 		G.buts->lockpoin= NULL;
 	}