Added errors handling
dfg