Make the displayed errors more generic to the user
Merge remote-tracking branch 'chiiph/bug/improve_displayed_errors' into develop