Slightly improved error handling ahead of completely rewriting this file
Slightly improved error handling ahead of completely rewriting this file

vitorio/ocropodium,vitorio/ocropodium,vitorio/ocropodium,vitorio/ocropodium