Prevent null pointer on new intent