L2SS-610: L2SS-611: Prevent assigning self.proxy twice Closes L2SS-610 and L2SS-611 See merge request !235