Added a handler of error in wrapper's constructor
Merge remote-tracking branch 'origin/master'