Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Gets rid of '|| ""' in multiple places and fixes #2067