Merge "Catch and log exceptions when setting system property"