1 files changed, 9 insertions, 1 deletions
diff --git a/Swiften/Base/DateTime.cpp b/Swiften/Base/DateTime.cpp
index 4f55a8e..d19e9c7 100644
--- a/Swiften/Base/DateTime.cpp
+++ b/Swiften/Base/DateTime.cpp
@@ -7,18 +7,19 @@
 #include <Swiften/Base/DateTime.h>
 
 #include <locale>
 #include <boost/date_time/time_facet.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/c_local_time_adjustor.hpp>
 
 #include <Swiften/Base/String.h>
+#include <Swiften/Base/Log.h>
 
 namespace Swift {
 
 boost::posix_time::ptime stringToDateTime(const std::string& string) {
 	static std::locale locale(std::locale::classic(), new boost::local_time::local_time_input_facet("%Y-%m-%d %H:%M:%S%F%ZP"));
 	std::istringstream stream(string); 
 	stream.imbue(locale);
 	boost::local_time::local_date_time result(boost::date_time::not_a_date_time);
 	stream >> result;
@@ -27,13 +28,20 @@ boost::posix_time::ptime stringToDateTime(const std::string& string) {
 
 std::string dateTimeToString(const boost::posix_time::ptime& time) {
 	std::string stampString = std::string(boost::posix_time::to_iso_extended_string(time));
 	String::replaceAll(stampString, ',', ".");
 	stampString += "Z";
 	return stampString;
 }
 
 std::string dateTimeToLocalString(const boost::posix_time::ptime& time) {
-	return boost::posix_time::to_simple_string(boost::date_time::c_local_adjustor<boost::posix_time::ptime>::utc_to_local(time));
+	std::string localString;
+	try {
+		localString = boost::posix_time::to_simple_string(boost::date_time::c_local_adjustor<boost::posix_time::ptime>::utc_to_local(time));
+	}
+	catch(std::out_of_range& exception) {
+		SWIFT_LOG(debug) << exception.what() << std::endl;
+	}
+	return localString;
 }
 
 }