Add more if statements to prevent exceptions we can't catch somehow

Add more if statements to prevent exceptions we can't catch somehow #412