Issue #491 - Enhancement : A more descriptive error messages

Issue #491 
@MohamedBassem