diff --git a/fblikebutton.module b/fblikebutton.module
index 64579b8..538044b 100644
--- a/fblikebutton.module
+++ b/fblikebutton.module
@@ -175,20 +175,20 @@ function fblikebutton_block_configure($delta = '') {
  */
 function fblikebutton_block_view($delta = '') {
   global $base_url;
+  $show = user_access('access fblikebutton');
+
   $node = node_load(arg(1));
-  $types = variable_get('fblikebutton_node_types', array());
   if ($node) {
-    $show = ( ! empty($types[$node->type]) && user_access('access fblikebutton'));
-  }
-  else {
-    $show = NULL;
+    $types = variable_get('fblikebutton_node_types', array());
+    $show = !empty($types[$node->type]);
   }
+
   $fullnodedisplay = variable_get('fblikebutton_full_node_display', 0);
   $block = array();
   switch ($delta) {
     case 'fblikebutton_dynamic_block':
       if ($show && $fullnodedisplay == 1) {
-        $webpage_to_like = url("node/$node->nid", array('absolute' => TRUE));
+        $webpage_to_like = $base_url . '/' . current_path();
         $conf = fblikebutton_conf();
         $block['content'] = _fblikebutton_field($webpage_to_like, $conf);
       }