diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
index 168fee9aef4..fb1cca0c0d5 100644
--- a/megamek/src/megamek/server/GameManager.java
+++ b/megamek/src/megamek/server/GameManager.java
@@ -1782,7 +1782,7 @@ private List<Report> bvReport(String name, int playerID, BVCountHelper bvc, bool
     private void entityStatusReport() {
         List<Report> reports = new ArrayList<>();
         List<Entity> entities = game.getEntitiesVector().stream()
-                .filter(e -> (e.isDeployed() && !((e instanceof MechWarrior) && ((MechWarrior) e).getPickedUpById() != Entity.NONE)))
+                .filter(e -> (e.isDeployed() && e.getPosition() != null))
                 .collect(Collectors.toList());
         Comparator<Entity> comp = Comparator.comparing((Entity e) -> e.getOwner().getTeam());
         comp = comp.thenComparing((Entity e) -> e.getOwner().getName());
@@ -1796,7 +1796,13 @@ private void entityStatusReport() {
             r = new Report(1231);
             r.subject = e.getId();
             r.addDesc(e);
-            r.add(UnitToolTip.getEntityTipReport(e).toString());
+            String etr = "";
+            try {
+                etr = UnitToolTip.getEntityTipReport(e).toString();
+            } catch (Exception ex) {
+                LogManager.getLogger().error("", ex);
+            }
+            r.add(etr);
             reports.add(r);
 
             r = new Report(1230, Report.PUBLIC);