Fixes #92 - null-guard Foreman waffling in MapArguments