     }
 
     func buildEntryWithCurrentPage() -> Entry? {
-        if let wv = webView, url = wv.URL {
+        if let url = currentURL, wv = webView {
             let en       = Entry(id: url.absoluteString)
             en.title     = wv.title
             en.author    = entry.author

    }

    func loadURL(url: NSURL) {
        currentURL = url
        webView?.loadRequest(NSURLRequest(URL: url))
    }


    // MARK: - WKNavigationDelegate

    func webView(webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
        currentURL = webView.URL
        indicator.center = webView.center
        view.addSubview(indicator)
        indicator.startAnimating()
