FIXED: Catch more error cases.