Bug Fix - Better Handling of invalid annotations