Added extra null-checks to fix #511
Always provide a content-intent now, fixes #510