Formatting, changed exception type.
Merge branch 'origin/master'