Just a bit better

Made it more failsafe and gave it a more serious appearance