Error handling for missing plots improved...