Adding deprecation errors as per #630