Minor fixes

Fix NullReference exception for the defaultUserId
Added Removal of the DlnaClient Plugin if exists