Issue #268: Fix NPE when bundle extra is null