atosin - check against NULL
atosin - check zero length
Merge branch 'master' of farm:octopus