Replace InvalidArgumentException by RuntimeException