Cleanup handling of NULL value passed for a mount option