Commit 4942b859 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '1125-500-error' into 'development'

Resolve "500 Error"

Closes #1125

See merge request !1866
parents 7501f2d6 dba14279