Improve type consistency#13

w01fgang merged 2 commits intomainToprent-app/try-catch:mainfrom

improve-type-consistencyToprent-app/try-catch:improve-type-consistencyCopy head branch name to clipboard