Improve error handling Co-authored-by: Jonas Franz <info@jonasfranz.software> Reviewed-on: #45 Reviewed-by: konrad <konrad@kola-entertainments.de>