Change into throw Exception programming style, it's better to catch exception later.
Merge remote-tracking branch 'origin/master'