Static method updated

Check paramiters before passing to constructor.