Restore memory frames only on fatal errors
Merge pull request #928 from sjinks/clean-fatal

[BUG] Restore memory frames only on fatal errors