Null check just in case. And check for mac os X for running maven tests.