Issues/uat 111 error on different platforms

https://jira.thehyve.nl/browse/UAT-111