fixes panics#59

panoschagias wants to merge 3 commits intojadijadi:mainjadijadi/riverraidrust:mainfrom

panoschagias:panic_bugpanoschagias/riverraidrust:panic_bugCopy head branch name to clipboard