Bugfix and remove unused try-catch