Fix #264 - Removed string cast and null check in favor of .ToString() call.