Fixed issue with null options