Exception throwing considering more cases

Testing and working at this point. Looks at integer conversion issues.