sync
-- add handling for fatal error
#1690
Merged
sync
-- add handling for fatal error
#1690