Fixed empty search case, added error message