bug fix

<b>Bugs</b>
https://github.com/Themis-J/Themis-Service/issues/61
https://github.com/Themis-J/Themis-Service/issues/62
https://github.com/Themis-J/Themis-Service/issues/60
https://github.com/Themis-J/Themis-Service/issues/59