Improved error handling.
Updated to QA environment.
Merge branch 'development'