Handle null interests in Surveyor
Fix unload exception in Controller.stopAndClearStorage
Remove unneeded denug trace