Merge branch 'fix-internal-server-errors' into 'master'

Fix internal server errors

See merge request !8