Avoid NPE
Fix ActivityNotFound Exception (reported on ACRA)