SOC-3509 | NPE in space ActivityStorageImpl for a number of user comment...

...s