Adding more null checks and developing kinit stage