Condition added to handle if no arguments supplied
updated with missing messages