Fix for NPE when querying BIE