Added null checks for passed arguments (another nail in coffin)