Merging in KRACOEUS-6905 to resolve stack trace.

Merged in change from KRACOEUS-6905 but unable to test due to inaccessible dependencies. Recommend testing to ensure it compiles properly.