Fix/return null on get

close #1