Initial draft
Catch silent crash
Initial draft
Performance improvement related to issue #129