trying to protect form nil
trying to protect against @partner nil
added missing end