Removed runtime exceptions from the catch