Remove header bar. Improved error handling