RM 3634 round - 1

[Tomáš Hrčka]

I am sending this patch because checking all error messages is taking longer 
then I expected. More patches are comming.