Added some checks to arguments passed through the interface