Sorry, one more thing -- why would this ever be set as a system property instead of an environment var? Right now you're checking for both.