Test fixed.
Test fixed.
Handle id string "null".
try catches added.