Fix for #863

There is already a null check in otherwise(Expression), so this should be a safe fix.