diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java b/Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java
index 060c8f19baccaa794c8b351bd34ebcfc62931d08..0e70671b20fcd071a52437af4c6e6c24655f153e 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java
@@ -52,7 +52,6 @@
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.Tag;
 import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.datamodel.TskDataException;
 
 /**
  * Implements the OS Accounts subnode of Results in the Autopsy tree.
@@ -170,10 +169,9 @@ protected boolean createKeys(List<OsAccount> list) {
                     if (filteringDSObjId == 0) {
                         list.addAll(skCase.getOsAccountManager().getOsAccounts());
                     } else {
-                        Host host = skCase.getHostManager().getHostByDataSource(skCase.getDataSource(filteringDSObjId));
-                        list.addAll(skCase.getOsAccountManager().getOsAccounts(host));
+                        list.addAll(skCase.getOsAccountManager().getOsAccountsByDataSourceObjId(filteringDSObjId));
                     }
-                } catch (TskCoreException | TskDataException ex) {
+                } catch (TskCoreException ex) {
                     logger.log(Level.SEVERE, "Unable to retrieve list of OsAccounts for case", ex);
                     return false;
                 }