Update for default Composer settings, add some extra error messages.