Add shell listing
Make SHELL-OBJECT just return nil/nil in case of error
Switch units to storage by OID