Proper handling of internal coordinate error
Merged in internal coordinate fix