Fixed two issues with rendering parameter values being null and causing the code to throw an exception