Resolves #463 by adding a null check prior to string comparison