(Android/Phoenix) fix two common crashes