fixes for locale switching bug #304
fixes NPE that sometimes occured on intent boolean