Bug Fix: Error management fix (wrong exception)
Authored by: dufgrinder 2021-05-14
Parent: [r90]
Child: [r92]
