LANGUAGE_NONE assumed we it should not be - cleanup
Robustness addition in case of server hickups