bugfixed + error message
Merge origin/master