Guard against null intent NPE's