diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
index 81866a254..88de3954e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
@@ -338,7 +338,7 @@ public class Item implements Bundlable {
 		levelKnown = true;
 		cursedKnown = true;
 		
-		if (Dungeon.hero.isAlive()) {
+		if (Dungeon.hero != null && Dungeon.hero.isAlive()) {
 			Catalog.setSeen(getClass());
 		}
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
index 332862ce6..1d0fa4b14 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
@@ -126,8 +126,10 @@ public class Potion extends Item {
 	@Override
 	public void reset(){
 		super.reset();
-		image = handler.image( this );
-		color = handler.label( this );
+		if (handler != null) {
+			image = handler.image(this);
+			color = handler.label(this);
+		}
 	};
 	
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
index a96e445b6..5e439a9be 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
@@ -109,8 +109,10 @@ public class Ring extends KindofMisc {
 	
 	public void reset() {
 		super.reset();
-		image	= handler.image( this );
-		gem		= handler.label( this );
+		if (handler != null){
+			image = handler.image(this);
+			gem = handler.label(this);
+		}
 	}
 	
 	public void activate( Char ch ) {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
index 266c3501a..bc021047f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
@@ -115,8 +115,10 @@ public abstract class Scroll extends Item {
 	@Override
 	public void reset(){
 		super.reset();
-		image = handler.image( this );
-		rune = handler.label( this );
+		if (handler != null) {
+			image = handler.image(this);
+			rune = handler.label(this);
+		}
 	};
 	
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java
index 59aeaa9c9..661fde91a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTitledMessage.java
@@ -31,7 +31,7 @@ import com.watabou.noosa.ui.Component;
 public class WndTitledMessage extends Window {
 
 	protected static final int WIDTH_P    = 120;
-	protected static final int WIDTH_L    = 144;
+	protected static final int WIDTH_L    = 160;
 	protected static final int GAP	= 2;
 
 	public WndTitledMessage( Image icon, String title, String message ) {