Fix issue with no params / Add a new exception