Minor indentation
Handling error conditions