Dealt with reurning no matches gracefully