Check options more gracefully