Potential crash fixhed
Merge branch 'master' of https://github.com/polimediaupv/paella
bugfix