Build crash fix

[Richard-Gist]

Linked Issue:

216

Checklist:

• [x] Did you sign the Contributor License Agreement?
• [x] Is the linter reporting 0 errors?
• [x] Did you comply with our styleguide?
• [x] Is there adequate test coverage for your new code?
• [x] Does the CI pipeline pass?

[Richard-Gist]

Creating this PR to get it into the public eye for a possible fix.