AttributeChangeActivity: Add better error handling. This is related to #15