1 files changed, 20 insertions, 17 deletions
diff --git a/Swiften/Entity/PayloadPersister.cpp b/Swiften/Entity/PayloadPersister.cpp
index 955135b..729d36a 100644
--- a/Swiften/Entity/PayloadPersister.cpp
+++ b/Swiften/Entity/PayloadPersister.cpp
@@ -25,29 +25,32 @@ PayloadPersister::~PayloadPersister() {
 }
 
 void PayloadPersister::savePayload(boost::shared_ptr<Payload> payload, const boost::filesystem::path& path) {
-	if (!boost::filesystem::exists(path.parent_path())) {
-		try {
+	try {
+		if (!boost::filesystem::exists(path.parent_path())) {
 			boost::filesystem::create_directories(path.parent_path());
 		}
-		catch (const boost::filesystem::filesystem_error& e) {
-			std::cerr << "ERROR: " << e.what() << std::endl;
-		}
+		boost::filesystem::ofstream file(path);
+		file << getSerializer()->serialize(payload);
+		file.close();
+	}
+	catch (const boost::filesystem::filesystem_error& e) {
+		std::cerr << "ERROR: " << e.what() << std::endl;
 	}
-	boost::filesystem::ofstream file(path);
-	file << getSerializer()->serialize(payload);
-	file.close();
 }
 
 boost::shared_ptr<Payload> PayloadPersister::loadPayload(const boost::filesystem::path& path) {
-	if (boost::filesystem::exists(path)) {
-		ByteArray data;
-		readByteArrayFromFile(data, path.string());
-		boost::shared_ptr<PayloadParser> parser(createParser());
-		PayloadParserTester tester(parser.get());
-		tester.parse(byteArrayToString(data));
-		return parser->getPayload();
+	try {
+		if (boost::filesystem::exists(path)) {
+			ByteArray data;
+			readByteArrayFromFile(data, path.string());
+			boost::shared_ptr<PayloadParser> parser(createParser());
+			PayloadParserTester tester(parser.get());
+			tester.parse(byteArrayToString(data));
+			return parser->getPayload();
+		}
 	}
-	else {
-		return boost::shared_ptr<Payload>();
+	catch (const boost::filesystem::filesystem_error& e) {
+		std::cerr << "ERROR: " << e.what() << std::endl;
 	}
+	return boost::shared_ptr<Payload>();
 }