Removed weird try/catch block added by commit 20bde31d21f557d52fb5b1623dcf8beb6e304920