Resolved issues with argument null-values