Don't free whitelist reply object unless it has been allocated. Minor cleanup