Replace try-except block by if-else statement

Replace try-except block by if-else statement #522