SOS-2249

...causes errors and exceptions