show better errors when errors happen
Merge remote-tracking branch 'origin/master'