some additional fixes for warnings and incorrect error message creation
5 files changed