Some error checking
Merge branch 'master' of https://github.com/liviu-/unsafe