removed commenting of exception