Try catch
Merge remote-tracking branch 'master/master'

Conflicts:
	protected/runtime/application.log
Merge remote-tracking branch 'rafael/master'

Conflicts:
	protected/runtime/application.log
	protected/runtime/application.log.orig
.