Fix for blank dates stacktrace issue