Error Handling Fixed.