[OE-2557] removed die()
Merge branch 'jira/2557' into feature/orbis