Removed commented out code
Rethrowing original exception