Fix possible Null severity issue and update help message