Fixed: Don't throw any exception when a locale is not valid. Fallback to the default locale instead
Small fixes
(cherry picked from commit 8bccbed)
(cherry picked from commit 309fe55)