FIXUP reorg

Author: dfandrich

exif-gps.cpp

@@ -120,19 +120,20 @@ char* ReadExifData(const char* File, int* IncludesGPS, double* Lat, double* Long
 		DEBUGLOG("Failed to open file %s.\n", File);
 		return NULL;
 	}
-	try {
-		Image->readMetadata();
-	} catch (Exiv2::Error& e) {
-		DEBUGLOG("Failed to read EXIF metadata in %s.\n", File);
-		return NULL;
-	}
 	if (Image.get() == NULL)
 	{
 		DEBUGLOG("Failed to read file %s %s.\n",
 			 File, Exiv2::strError().c_str());
 		return NULL;
 	}
 
+	try {
+		Image->readMetadata();
+	} catch (Exiv2::Error& e) {
+		DEBUGLOG("Failed to read EXIF metadata in %s.\n", File);
+		return NULL;
+	}
+
 	Exiv2::ExifData &ExifRead = Image->exifData();
 
 	// Read the tag out.