Added some setters removed by mistake and client null checks