diff --git a/reference/mysqli/mysqli/select-db.xml b/reference/mysqli/mysqli/select-db.xml
index 7cd0682606..48cbdbe79a 100644
--- a/reference/mysqli/mysqli/select-db.xml
+++ b/reference/mysqli/mysqli/select-db.xml
@@ -65,66 +65,44 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $mysqli = new mysqli("localhost", "my_user", "my_password", "test");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+/* get the name of the current default database */
+$result = $mysqli->query("SELECT DATABASE()");
+$row = $result->fetch_row();
+printf("Default database is %s.\n", $row[0]);
 
-/* return name of current default database */
-if ($result = $mysqli->query("SELECT DATABASE()")) {
-    $row = $result->fetch_row();
-    printf("Default database is %s.\n", $row[0]);
-    $result->close();
-}
-
-/* change db to world db */
+/* change default database to "world" */
 $mysqli->select_db("world");
 
-/* return name of current default database */
-if ($result = $mysqli->query("SELECT DATABASE()")) {
-    $row = $result->fetch_row();
-    printf("Default database is %s.\n", $row[0]);
-    $result->close();
-}
-
-$mysqli->close();
-?>
+/* get the name of the current default database */
+$result = $mysqli->query("SELECT DATABASE()");
+$row = $result->fetch_row();
+printf("Default database is %s.\n", $row[0]);
 ]]>
    </programlisting>
    <para>&style.procedural;</para>
    <programlisting role="php">
 <![CDATA[
 <?php
+
+mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 $link = mysqli_connect("localhost", "my_user", "my_password", "test");
 
-/* check connection */
-if (mysqli_connect_errno()) {
-    printf("Connect failed: %s\n", mysqli_connect_error());
-    exit();
-}
+/* get the name of the current default database */
+$result = mysqli_query($link, "SELECT DATABASE()");
+$row = mysqli_fetch_row($result);
+printf("Default database is %s.\n", $row[0]);
 
-/* return name of current default database */
-if ($result = mysqli_query($link, "SELECT DATABASE()")) {
-    $row = mysqli_fetch_row($result);
-    printf("Default database is %s.\n", $row[0]);
-    mysqli_free_result($result);
-}
-
-/* change db to world db */
+/* change default database to "world" */
 mysqli_select_db($link, "world");
 
-/* return name of current default database */
-if ($result = mysqli_query($link, "SELECT DATABASE()")) {
-    $row = mysqli_fetch_row($result);
-    printf("Default database is %s.\n", $row[0]);
-    mysqli_free_result($result);
-}
-
-mysqli_close($link);
-?>
+/* get the name of the current default database */
+$result = mysqli_query($link, "SELECT DATABASE()");
+$row = mysqli_fetch_row($result);
+printf("Default database is %s.\n", $row[0]);
 ]]>
    </programlisting>
    &examples.outputs;