Last fixes, removed mock and usage of real class, change of exception message.