Added containing type in all error messages.