MFH: r391341

• Fix a runtime dependency
• Fix a runtime error due a Linux dependent code snippet

Reported by: Torfinn Ingolfsen <tingox@gmail.com>
Tested by: Torfinn Ingolfsen <tingox@gmail.com>
Approved by: ports-secteam (delphij)