Fixed IllegalArgumentException being passed

 through