Fixed some exceptions that were improper
Merge remote-tracking branch 'origin/master'