diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 235fa79cd5..effc3063a6 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -2333,7 +2333,9 @@ function get_the_pagination( $args = array() ) {
 		// Set up paginated links.
 		$links = paginate_links( $args );
 
-		if ( $links ) {
+		// _navigation_markup() expects string,
+		// paginate_links() can return an array
+		if ( $links && ! is_array( $links ) ) {
 			$navigation = _navigation_markup( $links, 'pagination' );
 		}
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b31f3d3429..080a6cf4ff 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30165';
+$wp_version = '4.1-alpha-30166';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.