Add missing operators to list and add more error handling.