Closes laclasse-com/service-documents#68 (nil pointer exception)
Finish laclasse-com/service-documents#68 Issue#68