- improved error messages (bsc#889928 and bsc#903834)