Small error handling and label improvements