Merge branch 'issue/105' into 'develop'

Issue #105: Update error messages

See merge request !88
2 jobs for issue/109 in 1 minute and 36 seconds (queued for 4 seconds)