[STORM-396] Replace NullPointerException with IllegalArgumentExeption