Yes, we should either handle the NPE gracefully or support this use case. We should probably explore the possibilities first.