More Activity null checks