diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
index f13abdd2d4..cc3d757ab6 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
@@ -472,8 +472,8 @@ public final class ImageGalleryController {
         
         try {
             List<DataSource> dataSources = sleuthKitCase.getDataSources();
-            dataSources.forEach((ds) -> {
-                db.insertDataSource(ds.getId());
+            dataSources.forEach((dataSource) -> {
+                db.insertDataSource(dataSource.getId());
             });
         }
         catch (TskCoreException ex) {
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryTopComponent.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryTopComponent.java
index fbb3f2b8a4..1add37a2b7 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryTopComponent.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryTopComponent.java
@@ -107,12 +107,11 @@ public final class ImageGalleryTopComponent extends TopComponent implements Expl
     /**
      * Returns the top component window.
      * 
-     * @return Image gallery top component window
+     * @return Image gallery top component window, null if it's not open
      */
     @ThreadConfined(type = ThreadConfined.ThreadType.JFX)
     public static TopComponent getTopComponent() {
-        final TopComponent topComponent =  WindowManager.getDefault().findTopComponent(PREFERRED_ID);
-        return topComponent;   
+        return WindowManager.getDefault().findTopComponent(PREFERRED_ID);  
     }
     
     public static void openTopComponent() {