id Cannot be null as it is an int, thus the expression would always evaluate to false
The code was unreachable before so has been refactored
minor update as I didn't like the way I the code I wrote looked
Merge pull request #208 from matthewste/master

fixed some minor issues in code