App doesn't crash anymore