Added handlers for empty or incorrect params. Modified tests. Made suggested changes