Fixed possible null pointer exception. Fixes issue #6
Prepare release 1.3.8