builder pattern improvement, exceptions are added
Merge pull request #1 from nr4bt/builder-pattern-improvement

builder pattern improvement, exceptions are added