Changed NoneType handling for integers