BaseActivity crash fix