Activity: Add check to target before redirection.

Should flip those two conditions and change is_null() to empty() imo