Honestly I'm not even sure we need to return false but it was there to begin with. This makes it work. I'm not opposed to not returning anything for this whole function. 

@masterbee any comments ?