Removed back-button error

Update - removed error which closed the whole app when pressing the
back-button