GENERAL
Fixed a crash related issue when exiting the application