aidr-manager: additional try-catch
Merge remote-tracking branch 'origin/master'