Removed redundant self references.
Removed redundant self reference, cleaned up the exception handling.