Catch errors on passing in the class reader
Merge remote-tracking branch 'origin/master'