Fix a subtle bug concerning sites and bookmarks

It turns out that if a new site was created and the bookmark fails to save due
to, for instance, a validation error then the site will exist in the system
without that bookmark belonging to it.