Added system console & improved error handling