More edge case handling.