diff --git a/src/Orchard.Tests/Localization/DateTimePartsTests.cs b/src/Orchard.Tests/Localization/DateTimePartsTests.cs
index c36718d76..638dff300 100644
--- a/src/Orchard.Tests/Localization/DateTimePartsTests.cs
+++ b/src/Orchard.Tests/Localization/DateTimePartsTests.cs
@@ -1,6 +1,6 @@
 using System;
 using NUnit.Framework;
-using Orchard.Framework.Localization.Models;
+using Orchard.Localization.Models;
 
 namespace Orchard.Framework.Tests.Localization {
 
diff --git a/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs b/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs
index 22d9d956a..cf4f9deb1 100644
--- a/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs
+++ b/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs
@@ -9,8 +9,7 @@ using System.Threading.Tasks;
 using Autofac;
 using Moq;
 using NUnit.Framework;
-using Orchard.Framework.Localization.Models;
-using Orchard.Framework.Localization.Services;
+using Orchard.Localization.Models;
 using Orchard.Localization.Services;
 
 namespace Orchard.Framework.Tests.Localization {
@@ -116,6 +115,15 @@ namespace Orchard.Framework.Tests.Localization {
             }
         }
 
+        [Test]
+        [Description("Date/time parsing throws a FormatException for unparsable date/time strings.")]
+        [ExpectedException(typeof(FormatException))]
+        public void ParseDateTimeTest03() {
+            var container = InitializeContainer("en-US", null);
+            var target = container.Resolve<IDateFormatter>();
+            target.ParseDateTime("BlaBlaBla");
+        }
+
         [Test]
         [Description("Date parsing works correctly for all combinations of months, format strings and cultures.")]
         public void ParseDateTest01() {
@@ -165,6 +173,15 @@ namespace Orchard.Framework.Tests.Localization {
             }
         }
 
+        [Test]
+        [Description("Date parsing throws a FormatException for unparsable date strings.")]
+        [ExpectedException(typeof(FormatException))]
+        public void ParseDateTest02() {
+            var container = InitializeContainer("en-US", null);
+            var target = container.Resolve<IDateFormatter>();
+            target.ParseDate("BlaBlaBla");
+        }
+
         [Test]
         [Description("Time parsing works correctly for all combinations of hours, format strings and cultures.")]
         public void ParseTimeTest01() {
@@ -210,6 +227,15 @@ namespace Orchard.Framework.Tests.Localization {
             }
         }
 
+        [Test]
+        [Description("Time parsing throws a FormatException for unparsable time strings.")]
+        [ExpectedException(typeof(FormatException))]
+        public void ParseTimeTest02() {
+            var container = InitializeContainer("en-US", null);
+            var target = container.Resolve<IDateFormatter>();
+            target.ParseTime("BlaBlaBla");
+        }
+
         private DateTimeParts GetExpectedDateTimeParts(DateTime dateTime, string format) {
             return new DateTimeParts(
                 GetExpectedDateParts(dateTime, format),
diff --git a/src/Orchard/Localization/Models/DateParts.cs b/src/Orchard/Localization/Models/DateParts.cs
index 60346a17a..d06fe4f58 100644
--- a/src/Orchard/Localization/Models/DateParts.cs
+++ b/src/Orchard/Localization/Models/DateParts.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Orchard.Framework.Localization.Models {
+namespace Orchard.Localization.Models {
     public struct DateParts {
 
         public DateParts(int year, int month, int day) {
diff --git a/src/Orchard/Localization/Models/DateTimeParts.cs b/src/Orchard/Localization/Models/DateTimeParts.cs
index fcca1ff9a..67821ba4b 100644
--- a/src/Orchard/Localization/Models/DateTimeParts.cs
+++ b/src/Orchard/Localization/Models/DateTimeParts.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Orchard.Framework.Localization.Models {
+namespace Orchard.Localization.Models {
     public struct DateTimeParts {
 
         public DateTimeParts(int year, int month, int day, int hour, int minute, int second, int millisecond) {
diff --git a/src/Orchard/Localization/Models/TimeParts.cs b/src/Orchard/Localization/Models/TimeParts.cs
index b61d3662f..5393048b7 100644
--- a/src/Orchard/Localization/Models/TimeParts.cs
+++ b/src/Orchard/Localization/Models/TimeParts.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Orchard.Framework.Localization.Models {
+namespace Orchard.Localization.Models {
     public struct TimeParts {
 
         public TimeParts(int hour, int minute, int second, int millisecond) {
diff --git a/src/Orchard/Localization/Services/DefaultDateFormatter.cs b/src/Orchard/Localization/Services/DefaultDateFormatter.cs
index 0b8d238b6..7d5931077 100644
--- a/src/Orchard/Localization/Services/DefaultDateFormatter.cs
+++ b/src/Orchard/Localization/Services/DefaultDateFormatter.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Orchard.Framework.Localization.Models;
+using Orchard.Localization.Models;
 using Orchard.Localization.Services;
 using Orchard.Utility.Extensions;
 
-namespace Orchard.Framework.Localization.Services {
+namespace Orchard.Localization.Services {
 
     public class DefaultDateFormatter : IDateFormatter {
 
diff --git a/src/Orchard/Localization/Services/DefaultDateLocalizationServices.cs b/src/Orchard/Localization/Services/DefaultDateLocalizationServices.cs
index beeba2216..ca3b20783 100644
--- a/src/Orchard/Localization/Services/DefaultDateLocalizationServices.cs
+++ b/src/Orchard/Localization/Services/DefaultDateLocalizationServices.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 using Orchard.ContentManagement;
-using Orchard.Framework.Localization.Models;
+using Orchard.Localization.Models;
 using Orchard.Settings;
 
 namespace Orchard.Localization.Services {
diff --git a/src/Orchard/Localization/Services/IDateFormatter.cs b/src/Orchard/Localization/Services/IDateFormatter.cs
index 80c080658..cec67d09a 100644
--- a/src/Orchard/Localization/Services/IDateFormatter.cs
+++ b/src/Orchard/Localization/Services/IDateFormatter.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Orchard.Framework.Localization.Models;
+using Orchard.Localization.Models;
 
-namespace Orchard.Framework.Localization.Services {
+namespace Orchard.Localization.Services {
     public interface IDateFormatter : IDependency {
         DateTimeParts ParseDateTime(string dateTimeString);
         DateTimeParts ParseDateTime(string dateTimeString, string format);
diff --git a/src/Orchard/Localization/Services/IDateLocalizationServices.cs b/src/Orchard/Localization/Services/IDateLocalizationServices.cs
index f9df310f7..8d8fc4f8d 100644
--- a/src/Orchard/Localization/Services/IDateLocalizationServices.cs
+++ b/src/Orchard/Localization/Services/IDateLocalizationServices.cs
@@ -1,5 +1,5 @@
 using System;
-using Orchard.Framework.Localization.Models;
+using Orchard.Localization.Models;
 
 namespace Orchard.Localization.Services {