Added one exception handling.
Naming stuff.