Bugfix for: https://spoutdev.atlassian.net/browse/LEGACY-612

Please report again if you see this error.

Signed-off-by: Mike Howe <dockter@almuramc.com>