diff --git a/src/main/java/edu/unl/cse/csce361/hibernate/FruitPopulator.java b/src/main/java/edu/unl/cse/csce361/hibernate/FruitPopulator.java
index 8dddbc226c75f3f14ef85962e4beaf872b1f9761..26f9ef9773d461c9485a3fd85345033825cdd871 100644
--- a/src/main/java/edu/unl/cse/csce361/hibernate/FruitPopulator.java
+++ b/src/main/java/edu/unl/cse/csce361/hibernate/FruitPopulator.java
@@ -28,14 +28,16 @@ public class FruitPopulator {
     }
 
     public static void closeSession(Session session) {
-        try {
-            session.close();
-        } catch (HibernateException hibernateException) {
-            System.err.println("Failed to close session due to Hibernate problem.  " + hibernateException);
-            System.err.println("Abandoning possibly-open session.");
-        } finally {
-            //noinspection UnusedAssignment
-            session = null;
+        if (session != null) {
+            try {
+                session.close();
+            } catch (HibernateException hibernateException) {
+                System.err.println("Failed to close session due to Hibernate problem.  " + hibernateException);
+                System.err.println("Abandoning possibly-open session.");
+            } finally {
+                //noinspection UnusedAssignment
+                session = null;
+            }
         }
     }
 
@@ -70,7 +72,7 @@ public class FruitPopulator {
         FruitSalad fruitSalad = session.load(FruitSalad.class, 4);  // This is INCREDIBLY fragile
         session.getTransaction().commit();
         System.out.print(fruitSalad + " contains ");
-        for(Fruit fruit: fruitSalad.getFruits()) {
+        for (Fruit fruit : fruitSalad.getFruits()) {
             System.out.print(fruit + " and ");
         }
         System.out.println("that is all.");