Added some exception handling

Added a @ControllerAdvice class to handle invalid option