EDMIAPI/DatabaseWithFallback: Handle exception in GetDatatable

Modules.EDMIAPI/DatabaseWithFallback.vb

@@ -23,10 +23,18 @@ Public Class DatabaseWithFallback
             Dim oResult As DataTable = Nothing
 
             If ForceFallback = False Then
-                Dim oTableResult As TableResult = _Client.GetDatatableByName(DataTable, FilterExpression, SortByColumn)
+                Dim oTableResult As TableResult
+
+                Try
+                    oTableResult = _Client.GetDatatableByName(DataTable, FilterExpression, SortByColumn)
+                Catch ex As Exception
+                    _Logger.Error(ex)
+                    oTableResult = Nothing
+                End Try
 
                 If oTableResult Is Nothing OrElse oTableResult.OK = False Then
                     _Logger.Warn("Datatable [{0}] could not be fetched from AppServer Cache. Falling back to direct Database Access.")
+                    Return GetDatatableFromDatabase(FallbackSQL, FallbackType)
                 End If
 
                 Return oTableResult.Table