Fix one possibility to crush the app, make UI more intuitive