Added further validation
Fixed issue with shipping option not showing on checkout