Fix cases where the shorthands / options doesn't exists.
Fix cases where the shorthands / options doesn't exists.

TomzxForks/gh,tomzx/gh,dustinryerson/gh,TomzxForks/gh,henvic/gh,oouyang/gh,modulexcite/gh,modulexcite/gh,tomzx/gh,henvic/gh,dustinryerson/gh,oouyang/gh