fix NPE; fix upwards/downwards(?) "injection" case