Changed all false returns to null in case of error (#34)
Added and improved tests