tree de8cb1cdacadcdebbc31875f9a264bafdf083424
parent 22a925dcbeeda3951dd7c4af4489c8f4b9a2ce2c
author Pavlin Radoslavov <pavlin@onlab.us> 1387501283 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> 1387501283 -0800

Added null-pointer checks.
The second check fixes a failing unit test.

Note: the first null-pointer check was observed by reading
the code, and might not be a complete solution.

Code reviewed and tested by: Ping Ping