Added check for numeric ids and null pointers (thanks to Dimitrie).

1 file changed