[#862832] Some initial error handling.