diff --git a/android/app/build.gradle b/android/app/build.gradle
index 783d792e2..3c88b762e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -29,8 +29,8 @@ android {
         applicationId "com.invoiceninja.flutter"
         minSdkVersion 18
         targetSdkVersion 27
-        versionCode 37
-        versionName "0.1.37"
+        versionCode 38
+        versionName "0.1.38"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/ios/Runner/Info.plist.example b/ios/Runner/Info.plist.example
index cf53221e2..378e81e82 100644
--- a/ios/Runner/Info.plist.example
+++ b/ios/Runner/Info.plist.example
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.37</string>
+	<string>0.1.38</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>37</string>
+	<string>38</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
diff --git a/lib/constants.dart b/lib/constants.dart
index 2fb676aec..4c135deef 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 // This version must be updated in tandem with the pubspec version.
-const String kAppVersion = '0.1.37';
+const String kAppVersion = '0.1.38';
 const String kAppUrl = 'https://app.invoiceninja.com';
 
 const String kAppleStoreUrl =
diff --git a/lib/utils/formatting.dart b/lib/utils/formatting.dart
index 9cca23891..481e3cda9 100644
--- a/lib/utils/formatting.dart
+++ b/lib/utils/formatting.dart
@@ -209,6 +209,7 @@ String formatDuration(Duration duration, {bool showSeconds = true}) {
 }
 
 DateTime convertTimeOfDayToDateTime(TimeOfDay timeOfDay, DateTime dateTime) {
+  dateTime ??= DateTime.now();
   return DateTime(dateTime.year, dateTime.month, dateTime.day,
           timeOfDay?.hour ?? 0, timeOfDay?.minute ?? 0)
       .toUtc();
diff --git a/pubspec.yaml b/pubspec.yaml
index 95f73757d..7e8c72dee 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Mobile app for Invoice Ninja
-version: 0.1.37
+version: 0.1.38
 author: Hillel Coren
 homepage: https://www.invoiceninja.com
 documentation: http://docs.invoiceninja.com