Issue #269: Fix NPE when bundle extras is null.