[stable-3.15] Bugfix/catch exceptions to prevent crash

[stable-3.15] Bugfix/catch exceptions to prevent crash #1957