Fixed #33 should be return null if object is null in safety call.