just rethrow error exceptions.
fix conflict.
Merge branch 'master' of github.com:laravel/framework