Move assert so it doesn't fire for null addresses