Improvement: Removed internal error message from user friendly message
Authored by: floriwan 2011-03-26
Parent: [r138]
Child: [r140]