[forge-commits] [forge/core] f87d35: Added null check to avoid NPE in Shell