some improvment on error handeling
Merge remote-tracking branch 'origin/master'