This fixes the possibility of panicing on a nil pointer by running the verification steps earlier. Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
