More validation

Added more validation in controller