Fixes for handling null securities.