Update build, fixes uncaught InvalidArgumentException

Change-Id: I69b26acf8390a5d13211b1e3b114bf55f6f1dc3a