Technical debts removed - Generic exceptions