MARMOTTA-563: Added some additional error checks