FB 4924 - NPE issue. Hoping to fix, or provide better diagnostics.