Added a few catches for parts that expect ints