Improved warning message
Merged changes of Guus
Merged changes by GFT