added additional error checking
added additional error checking

hhroc/yellr-server,Nolski/yellr-server,hhroc/yellr-server,thequbit/yellr-server,thequbit/yellr-server,hhroc/yellr-server,Nolski/yellr-server,thequbit/yellr-server,Nolski/yellr-server,thequbit/yellr-server,hhroc/yellr-server,Nolski/yellr-server