Fix a few rubocop warnings
Don't rescue the exception