removed pointless null check on callback param