Add some error-handling for missing title/author