Merge branch 'hotfix/bugs'
Fixed more locations containing the same bug for error reporting
Merge branch 'hotfix/bugs' into develop