Feature/fix npe