indent fix
Unneeded assignment
Revert "Fix setting error message in exception"

This reverts commit bc440f5f6bb8a0b9f0e93de2fae2455e0c8fa0c7.