Locking things down a bit more

Fixing a potential bug if there aren't settings