I know that unit tests are still work in progress, but when you get to them make sure to verify that this method (as well as other) works with nulls.