Reconcile master and development, and improve error handling.