Improved error handling.
Updated to QA environment.