fix: nil pointers identified by nilaway (part 2)

fix: nil pointers identified by nilaway (part 2) #341