Revert "Revert "Removed try-catch for performance reasons""

This reverts commit 3e2b58e861c5023e87f0e339b00b4efd901886d0.