Proposed fix: To add a (Locale) before both null appearances. As the
.diff attached.

What do you think about it?