FORGE-1467: Added CommandNotFoundHandler