fixed : insert error check
Merge remote-tracking branch 'origin/master'