Show 'access denied' if published but user does not have view permission

Module works great, but it *always* shows "page not found", even if a node is published *but* the user does not have access to view the node. I believe modifying the module in the following way would only show the "page not found" message if a node is unpublished, but would show "access denied" when a node is published but the user does not have permission to view it:

function unpublished_404_node_page_view($node) {

  // check status, show 404 if unpublished
  if ($node->status == 0) {
    $node_content = MENU_NOT_FOUND;
  }
  // if published, check access
  elseif (!node_access('view', $node)) {
    $node_content = MENU_ACCESS_DENIED;
  }
  else {
    $node_content = node_page_view($node);
  }

  return $node_content;
}

This may not be the best method to do so, but regardless it would be a nice feature...