diff --git a/src/main/java/forge/view/bazaar/ViewStall.java b/src/main/java/forge/view/bazaar/ViewStall.java
index 50964a9d3dd..daa7cd110ab 100644
--- a/src/main/java/forge/view/bazaar/ViewStall.java
+++ b/src/main/java/forge/view/bazaar/ViewStall.java
@@ -143,6 +143,8 @@ public class ViewStall extends JPanel {
      * and creates new panels if necessary.
      */
     public void updateStall() {
+        if (AllZone.getQuestData() == null) { return; }
+
         this.lblStats.setText(
                 "Credits: " + AllZone.getQuestData().getCredits()
                 + "         Life: " + AllZone.getQuestData().getLife());
diff --git a/src/main/java/forge/view/toolbox/FPanel.java b/src/main/java/forge/view/toolbox/FPanel.java
index 8efa5dc6b95..e2039260b53 100644
--- a/src/main/java/forge/view/toolbox/FPanel.java
+++ b/src/main/java/forge/view/toolbox/FPanel.java
@@ -230,7 +230,6 @@ public class FPanel extends JPanel {
         else if (selectable)    { g2d0.setColor(FSkin.getColor(FSkin.Colors.CLR_INACTIVE)); }
         else                    { g2d0.setColor(getBackground()); }
 
-        // Parent must be drawn onto clipped object.
         g2d0.fillRoundRect(0, 0, pnlW, pnlH, cornerDiameter, cornerDiameter);
     }