fix: nil pointers identified by nilaway (part 1)

fix: nil pointers identified by nilaway (part 1) #335