rmm
fix: added broad exception handling branch too, cleanup
88f66c3