Follow null issue fixed